[haiku-commits] r36871 - haiku/branches/features/stack-and-tile/src/servers/app

From: clemens.zeidler@xxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 20 May 2010 05:46:26 +0200 (CEST)
Author: czeidler
Date: 2010-05-20 05:46:26 +0200 (Thu, 20 May 2010)
New Revision: 36871
Changeset: http://dev.haiku-os.org/changeset/36871/haiku

Modified:
   haiku/branches/features/stack-and-tile/src/servers/app/Window.cpp
   haiku/branches/features/stack-and-tile/src/servers/app/Window.h
Log:
Remove SAT completely from Window.



Modified: haiku/branches/features/stack-and-tile/src/servers/app/Window.cpp
===================================================================
--- haiku/branches/features/stack-and-tile/src/servers/app/Window.cpp   
2010-05-20 03:43:09 UTC (rev 36870)
+++ haiku/branches/features/stack-and-tile/src/servers/app/Window.cpp   
2010-05-20 03:46:26 UTC (rev 36871)
@@ -138,8 +138,6 @@
 
        fWorkspacesViewCount(0)
 {
-       fStackAndTileWindow = new StackAndTileWindow(this);
-
        // make sure our arguments are valid
        if (!IsValidLook(fLook))
                fLook = B_TITLED_WINDOW_LOOK;
@@ -184,8 +182,6 @@
 
 Window::~Window()
 {
-       delete fStackAndTileWindow;
-
        if (fTopView) {
                fTopView->DetachedFromWindow();
                delete fTopView;
@@ -759,7 +755,6 @@
        }
 }
 
-
 // DisableUpdateRequests
 void
 Window::DisableUpdateRequests()
@@ -886,8 +881,6 @@
                        fRegionPool.Recycle(visibleBorder);
                }
 
-               fStackAndTileWindow->MouseDown();
-
                if (action == CLICK_MOVE_TO_BACK) {
                        if (desktopSettings.MouseMode() == 
B_CLICK_TO_FOCUS_MOUSE) {
                                bool covered = true;
@@ -998,8 +991,6 @@
                        }
                }
 
-               fStackAndTileWindow->MouseUp();
-
                engine->UnlockParallelAccess();
 
                fRegionPool.Recycle(visibleBorder);
@@ -1128,8 +1119,6 @@
                        _AlterDeltaForSnap(delta, now);
                        fDesktop->MoveWindowBy(this, delta.x, delta.y);
 
-                       fStackAndTileWindow->MoveWindow();
-
                        // constrain delta to true change in position
                        delta = fFrame.LeftTop() - oldLeftTop;
                } else
@@ -1147,8 +1136,6 @@
 
                        fDesktop->ResizeWindowBy(this, delta.x, delta.y);
 
-                       fStackAndTileWindow->ResizeWindow();
-
                        // constrain delta to true change in size
                        delta = fFrame.RightBottom() - oldRightBottom;
                } else
@@ -1451,20 +1438,17 @@
                // the border region changed if ret is true
                fBorderRegionValid = fBorderRegionValid && !ret;
        }
-       if (!ret)
-               return false;
-
-       return fStackAndTileWindow->SetSettings(settings, &dirty);
+       return ret;
 }
 
 
 bool
 Window::GetDecoratorSettings(BMessage* settings)
 {
-       if (fDecorator && !fDecorator->GetSettings(settings))
-               return false;
+       if (fDecorator)
+               return fDecorator->GetSettings(settings);
 
-       return fStackAndTileWindow->GetSettings(settings);
+       return false;
 }
 
 
@@ -2401,7 +2385,6 @@
 }
 
 
-
 void
 Window::UpdateSession::MoveBy(int32 x, int32 y)
 {
@@ -2426,3 +2409,4 @@
        fCause |= cause;
 }
 
+

Modified: haiku/branches/features/stack-and-tile/src/servers/app/Window.h
===================================================================
--- haiku/branches/features/stack-and-tile/src/servers/app/Window.h     
2010-05-20 03:43:09 UTC (rev 36870)
+++ haiku/branches/features/stack-and-tile/src/servers/app/Window.h     
2010-05-20 03:46:26 UTC (rev 36871)
@@ -16,7 +16,6 @@
 #include "Decorator.h"
 #include "RegionPool.h"
 #include "ServerWindow.h"
-#include "StackAndTile.h"
 #include "View.h"
 #include "WindowList.h"
 
@@ -24,7 +23,6 @@
 #include <Region.h>
 #include <String.h>
 
-
 namespace BPrivate {
        class PortLink;
 };
@@ -73,9 +71,6 @@
                        void                            SetScreen(const 
::Screen* screen);
                        const ::Screen*         Screen() const;
 
-                       StackAndTileWindow*     GetStackAndTileWindow() const
-                                                                       { 
return fStackAndTileWindow; }
-
                        // setting and getting the "hard" clipping, you need to 
have
                        // WriteLock()ed the clipping!
                        void                            SetClipping(BRegion* 
stillAvailableOnScreen);
@@ -172,10 +167,10 @@
                        void                            SetMinimized(bool 
minimized);
        inline  bool                            IsMinimized() const { return 
fMinimized; }
 
-                       int32                           CurrentWorkspace()
-                                                                       { 
return fCurrentWorkspace; }
                        void                            
SetCurrentWorkspace(int32 index)
                                                                        { 
fCurrentWorkspace = index; }
+                       int32                           CurrentWorkspace() const
+                                                                       { 
return fCurrentWorkspace; }
                        bool                            IsVisible() const;
 
                        bool                            IsDragging() const { 
return fIsDragging; }
@@ -405,8 +400,6 @@
                        int32                           fMaxHeight;
 
                        int32                           fWorkspacesViewCount;
-
-                       StackAndTileWindow*     fStackAndTileWindow;
 };
 
 #endif // WINDOW_H
[haiku-commits] r36871 - haiku/branches/features/stack-and-tile/src/servers/app

Other related posts:
