[haiku-commits] r38076 - haiku/trunk/src/add-ons/decorators/SATDecorator
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 13 Aug 2010 06:06:59 +0200 (CEST)
Author: czeidler
Date: 2010-08-13 06:06:58 +0200 (Fri, 13 Aug 2010)
New Revision: 38076
Changeset: http://dev.haiku-os.org/changeset/38076
Modified:
haiku/trunk/src/add-ons/decorators/SATDecorator/SATGroup.h
haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.h
haiku/trunk/src/add-ons/decorators/SATDecorator/Tiling.cpp
Log:
Fix gcc2 build.
Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/SATGroup.h
===================================================================
--- haiku/trunk/src/add-ons/decorators/SATDecorator/SATGroup.h 2010-08-12
23:32:23 UTC (rev 38075)
+++ haiku/trunk/src/add-ons/decorators/SATDecorator/SATGroup.h 2010-08-13
04:06:58 UTC (rev 38076)
@@ -191,7 +191,7 @@
public:
friend class Tab;
friend class WindowArea;
- friend class SATWindow;
+ friend class GroupCookie;
SATGroup();
~SATGroup();
Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
===================================================================
--- haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
2010-08-12 23:32:23 UTC (rev 38075)
+++ haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
2010-08-13 04:06:58 UTC (rev 38076)
@@ -10,6 +10,7 @@
#include <Debug.h>
+#include "SATGroup.h"
#include "Window.h"
@@ -322,7 +323,7 @@
}
-SATWindow::GroupCookie::GroupCookie(SATWindow* satWindow)
+GroupCookie::GroupCookie(SATWindow* satWindow)
:
fSATWindow(satWindow),
@@ -349,14 +350,14 @@
}
-SATWindow::GroupCookie::~GroupCookie()
+GroupCookie::~GroupCookie()
{
Uninit();
}
void
-SATWindow::GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
+GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
{
if (!fSATGroup.Get())
return;
@@ -400,7 +401,7 @@
void
-SATWindow::GroupCookie::MoveWindow(int32 workspace)
+GroupCookie::MoveWindow(int32 workspace)
{
Window* window = fSATWindow->GetWindow();
Desktop* desktop = window->Desktop();
@@ -418,7 +419,7 @@
bool
-SATWindow::GroupCookie::Init(SATGroup* group, WindowArea* area)
+GroupCookie::Init(SATGroup* group, WindowArea* area)
{
ASSERT(fSATGroup.Get() == NULL);
@@ -489,7 +490,7 @@
void
-SATWindow::GroupCookie::Uninit()
+GroupCookie::Uninit()
{
delete leftBorder;
delete topBorder;
@@ -528,7 +529,7 @@
bool
-SATWindow::GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area)
+GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area)
{
if (!fSATGroup->fSATWindowList.RemoveItem(fSATWindow))
return false;
Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.h
===================================================================
--- haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.h 2010-08-12
23:32:23 UTC (rev 38075)
+++ haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.h 2010-08-13
04:06:58 UTC (rev 38076)
@@ -11,16 +11,60 @@
#include <Region.h>
#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<SATGroup> 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,57 +107,13 @@
void TabLocationMoved(float
location, bool shifting);
private:
- void _InitGroup();
+ void _InitGroup();
- Window* fWindow;
- SATDecorator* fDecorator;
- StackAndTile* fStackAndTile;
- Desktop* fDesktop;
+ 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<SATGroup> 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;
- };
-
//! Current group.
GroupCookie* fGroupCookie;
/*! If the window is added to another group the own group is
cached
Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/Tiling.cpp
===================================================================
--- haiku/trunk/src/add-ons/decorators/SATDecorator/Tiling.cpp 2010-08-12
23:32:23 UTC (rev 38075)
+++ haiku/trunk/src/add-ons/decorators/SATDecorator/Tiling.cpp 2010-08-13
04:06:58 UTC (rev 38076)
@@ -437,8 +437,6 @@
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
Other related posts:
- » [haiku-commits] r38076 - haiku/trunk/src/add-ons/decorators/SATDecorator - clemens . zeidler
