From 756e5df62fe2dc863c0e90f57d7b8466e184e332 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Fri, 13 Aug 2010 04:06:58 +0000 Subject: [PATCH] Fix gcc2 build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38076 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../decorators/SATDecorator/SATGroup.h | 2 +- .../decorators/SATDecorator/SATWindow.cpp | 15 +-- .../decorators/SATDecorator/SATWindow.h | 100 +++++++++--------- .../decorators/SATDecorator/Tiling.cpp | 2 - 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/src/add-ons/decorators/SATDecorator/SATGroup.h b/src/add-ons/decorators/SATDecorator/SATGroup.h index c2c4d2876c..5ca9350be0 100644 --- a/src/add-ons/decorators/SATDecorator/SATGroup.h +++ b/src/add-ons/decorators/SATDecorator/SATGroup.h @@ -191,7 +191,7 @@ class SATGroup : public BReferenceable { public: friend class Tab; friend class WindowArea; - friend class SATWindow; + friend class GroupCookie; SATGroup(); ~SATGroup(); diff --git a/src/add-ons/decorators/SATDecorator/SATWindow.cpp b/src/add-ons/decorators/SATDecorator/SATWindow.cpp index cd93c4b56e..bd619a1ee6 100644 --- a/src/add-ons/decorators/SATDecorator/SATWindow.cpp +++ b/src/add-ons/decorators/SATDecorator/SATWindow.cpp @@ -10,6 +10,7 @@ #include +#include "SATGroup.h" #include "Window.h" @@ -322,7 +323,7 @@ SATWindow::_InitGroup() } -SATWindow::GroupCookie::GroupCookie(SATWindow* satWindow) +GroupCookie::GroupCookie(SATWindow* satWindow) : fSATWindow(satWindow), @@ -349,14 +350,14 @@ SATWindow::GroupCookie::GroupCookie(SATWindow* satWindow) } -SATWindow::GroupCookie::~GroupCookie() +GroupCookie::~GroupCookie() { Uninit(); } void -SATWindow::GroupCookie::DoGroupLayout(SATWindow* triggerWindow) +GroupCookie::DoGroupLayout(SATWindow* triggerWindow) { if (!fSATGroup.Get()) return; @@ -400,7 +401,7 @@ SATWindow::GroupCookie::DoGroupLayout(SATWindow* triggerWindow) void -SATWindow::GroupCookie::MoveWindow(int32 workspace) +GroupCookie::MoveWindow(int32 workspace) { Window* window = fSATWindow->GetWindow(); Desktop* desktop = window->Desktop(); @@ -418,7 +419,7 @@ SATWindow::GroupCookie::MoveWindow(int32 workspace) bool -SATWindow::GroupCookie::Init(SATGroup* group, WindowArea* area) +GroupCookie::Init(SATGroup* group, WindowArea* area) { ASSERT(fSATGroup.Get() == NULL); @@ -489,7 +490,7 @@ SATWindow::GroupCookie::Init(SATGroup* group, WindowArea* area) void -SATWindow::GroupCookie::Uninit() +GroupCookie::Uninit() { delete leftBorder; delete topBorder; @@ -528,7 +529,7 @@ SATWindow::GroupCookie::Uninit() bool -SATWindow::GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area) +GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area) { if (!fSATGroup->fSATWindowList.RemoveItem(fSATWindow)) return false; diff --git a/src/add-ons/decorators/SATDecorator/SATWindow.h b/src/add-ons/decorators/SATDecorator/SATWindow.h index 059ab77eba..33f25931f5 100644 --- a/src/add-ons/decorators/SATDecorator/SATWindow.h +++ b/src/add-ons/decorators/SATDecorator/SATWindow.h @@ -11,16 +11,60 @@ #include #include "SATDecorator.h" -#include "SATGroup.h" #include "Stacking.h" #include "Tiling.h" class Desktop; +class SATGroup; class StackAndTile; class Window; +class GroupCookie +{ +public: + GroupCookie(SATWindow* satWindow); + ~GroupCookie(); + + bool Init(SATGroup* group, WindowArea* area); + void Uninit(); + + void DoGroupLayout(SATWindow* triggerWindow); + void MoveWindow(int32 workspace); + + SATGroup* GetGroup() { return fSATGroup.Get(); } + + WindowArea* GetWindowArea() { return windowArea; } + + bool PropagateToGroup(SATGroup* group, WindowArea* area); + +private: + SATWindow* fSATWindow; + + BReference fSATGroup; + + WindowArea* windowArea; + + Variable* leftBorder; + Variable* topBorder; + Variable* rightBorder; + Variable* bottomBorder; + + Constraint* leftBorderConstraint; + Constraint* topBorderConstraint; + Constraint* rightBorderConstraint; + Constraint* bottomBorderConstraint; + + Constraint* leftConstraint; + Constraint* topConstraint; + Constraint* minWidthConstraint; + Constraint* minHeightConstraint; + Constraint* widthConstraint; + Constraint* heightConstraint; +}; + + class SATWindow { public: SATWindow(StackAndTile* sat, Window* window); @@ -63,56 +107,12 @@ public: void TabLocationMoved(float location, bool shifting); private: - void _InitGroup(); + void _InitGroup(); - Window* fWindow; - SATDecorator* fDecorator; - StackAndTile* fStackAndTile; - Desktop* fDesktop; - - class GroupCookie - { - public: - GroupCookie(SATWindow* satWindow); - ~GroupCookie(); - - bool Init(SATGroup* group, WindowArea* area); - void Uninit(); - - void DoGroupLayout(SATWindow* triggerWindow); - void MoveWindow(int32 workspace); - - SATGroup* GetGroup() { return fSATGroup.Get(); } - - WindowArea* GetWindowArea() { return windowArea; } - - bool PropagateToGroup(SATGroup* group, - WindowArea* area); - - private: - SATWindow* fSATWindow; - - BReference fSATGroup; - - WindowArea* windowArea; - - Variable* leftBorder; - Variable* topBorder; - Variable* rightBorder; - Variable* bottomBorder; - - Constraint* leftBorderConstraint; - Constraint* topBorderConstraint; - Constraint* rightBorderConstraint; - Constraint* bottomBorderConstraint; - - Constraint* leftConstraint; - Constraint* topConstraint; - Constraint* minWidthConstraint; - Constraint* minHeightConstraint; - Constraint* widthConstraint; - Constraint* heightConstraint; - }; + Window* fWindow; + SATDecorator* fDecorator; + StackAndTile* fStackAndTile; + Desktop* fDesktop; //! Current group. GroupCookie* fGroupCookie; diff --git a/src/add-ons/decorators/SATDecorator/Tiling.cpp b/src/add-ons/decorators/SATDecorator/Tiling.cpp index 07a4c177b9..4de5225d1a 100644 --- a/src/add-ons/decorators/SATDecorator/Tiling.cpp +++ b/src/add-ons/decorators/SATDecorator/Tiling.cpp @@ -437,8 +437,6 @@ SATTiling::_FreeAreaSize() void SATTiling::_HighlightWindows(SATGroup* group, bool highlight) { - BRect windowFrame = fSATWindow->CompleteWindowFrame(); - const TabList* hTabs = group->HorizontalTabs(); const TabList* vTabs = group->VerticalTabs(); // height light windows at all four sites