Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* make sure that fTopLayer is NULL when the top layer is deleted

Browse Source 
* make sure layers are removed from the token space when the
  WindowLayer is deleted


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15852 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-01-06 17:17:54 +00:00
parent fb82d189d0
commit 1e1b86ef54
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/servers/app/ViewLayer.cpp
View File

@ -84,6 +84,9 @@ ViewLayer::~ViewLayer()
delete fDrawState;
if (fWindow && this == fWindow->TopLayer())
fWindow->SetTopLayer(NULL);
// TODO: Don't know yet if we should also delete fPicture
// iterate over children and delete each one

39
src/servers/app/WindowLayer.cpp
View File

@ -159,6 +159,9 @@ WindowLayer::WindowLayer(const BRect& frame, const char *name,
WindowLayer::~WindowLayer()
{
if (fTopLayer)
fTopLayer->DetachedFromWindow();
delete fTopLayer;
delete fDecorator;
}
@ -501,23 +504,25 @@ WindowLayer::CopyContents(BRegion* region, int32 xOffset, int32 yOffset)
void
WindowLayer::SetTopLayer(ViewLayer* topLayer)
{
// the top layer is special, it has a coordinate system
// as if it was attached directly to the desktop, therefor,
// the coordinate conversion through the layer tree works
// as expected, since the top layer has no "parent" but has
// fFrame as if it had
fTopLayer = topLayer;
// make sure the location of the top layer on screen matches ours
fTopLayer->MoveBy(fFrame.left - fTopLayer->Frame().left,
fFrame.top - fTopLayer->Frame().top, NULL);
// make sure the size of the top layer matches ours
fTopLayer->ResizeBy(fFrame.Width() - fTopLayer->Frame().Width(),
fFrame.Height() - fTopLayer->Frame().Height(), NULL);
fTopLayer->AttachedToWindow(this);
if (fTopLayer) {
// the top layer is special, it has a coordinate system
// as if it was attached directly to the desktop, therefor,
// the coordinate conversion through the layer tree works
// as expected, since the top layer has no "parent" but has
// fFrame as if it had
// make sure the location of the top layer on screen matches ours
fTopLayer->MoveBy(fFrame.left - fTopLayer->Frame().left,
fFrame.top - fTopLayer->Frame().top, NULL);
// make sure the size of the top layer matches ours
fTopLayer->ResizeBy(fFrame.Width() - fTopLayer->Frame().Width(),
fFrame.Height() - fTopLayer->Frame().Height(), NULL);
fTopLayer->AttachedToWindow(this);
}
}
@ -1329,7 +1334,7 @@ WindowLayer::Backmost(WindowLayer* window, int32 workspace)
/*!
\brief Returns the windows that's in front of the frontmost position
this window can get.
Returns NULL is this window can be the frontmost window.
Returns NULL if this window can be the frontmost window.
*/
WindowLayer*
WindowLayer::Frontmost(WindowLayer* first, int32 workspace)