Removed the "owner" stuff from Layer - it already knows its window.

Layer no longer knows anything about its subclass WindowLayer.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15131 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-24 17:59:49 +00:00
parent be2f498e8a
commit 1863b5b6a4
3 changed files with 4 additions and 8 deletions
+3 -3
View File
@@ -8,8 +8,9 @@
* Stephan Aßmus <[email protected]> * Stephan Aßmus <[email protected]>
*/ */
/** Class used for tracking drawing context and screen clipping. /*!
* One Layer per client BWindow (WindowBorder) and each BView therein. Class used for tracking drawing context and screen clipping.
One Layer per client BWindow (WindowLayer) and each BView therein.
*/ */
#include <string.h> #include <string.h>
@@ -50,7 +51,6 @@ Layer::Layer(BRect frame, const char* name, int32 token,
fDriver(driver), fDriver(driver),
fRootLayer(NULL), fRootLayer(NULL),
fWindow(NULL), fWindow(NULL),
fOwner(NULL),
fDrawState(new DrawState), fDrawState(new DrawState),
-3
View File
@@ -170,8 +170,6 @@ class Layer {
{ return fWindow; } { return fWindow; }
ServerApp* App() const ServerApp* App() const
{ return fWindow ? fWindow->App() : NULL; } { return fWindow ? fWindow->App() : NULL; }
inline WindowLayer* Owner() const
{ return fOwner; }
RootLayer* GetRootLayer() const RootLayer* GetRootLayer() const
{ return fRootLayer; } { return fRootLayer; }
void SetRootLayer(RootLayer* rl) void SetRootLayer(RootLayer* rl)
@@ -240,7 +238,6 @@ class Layer {
DrawingEngine* fDriver; DrawingEngine* fDriver;
RootLayer* fRootLayer; RootLayer* fRootLayer;
ServerWindow* fWindow; ServerWindow* fWindow;
WindowLayer* fOwner;
DrawState* fDrawState; DrawState* fDrawState;
-1
View File
@@ -506,7 +506,6 @@ ServerWindow::CreateLayerTree(BPrivate::LinkReceiver &link, Layer **_parent)
newLayer->fHidden = hidden; newLayer->fHidden = hidden;
newLayer->fEventMask = eventMask; newLayer->fEventMask = eventMask;
newLayer->fEventOptions = eventOptions; newLayer->fEventOptions = eventOptions;
newLayer->fOwner = fWindowLayer;
DesktopSettings settings(fDesktop); DesktopSettings settings(fDesktop);
ServerFont font; ServerFont font;