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:
@@ -8,9 +8,10 @@
|
|||||||
* 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>
|
||||||
#include <stdio.h>
|
#include <stdio.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),
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user