Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gcc2 build.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38076 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2010-08-13 04:06:58 +00:00
parent 323e7fe567
commit 756e5df62f
4 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/decorators/SATDecorator/SATGroup.h
View File

@ -191,7 +191,7 @@ class SATGroup : public BReferenceable {
public: public:
friend class Tab; friend class Tab;
friend class WindowArea; friend class WindowArea;
friend class SATWindow; friend class GroupCookie;
SATGroup(); SATGroup();
~SATGroup(); ~SATGroup();

15
src/add-ons/decorators/SATDecorator/SATWindow.cpp
View File

@ -10,6 +10,7 @@
#include <Debug.h> #include <Debug.h>
#include "SATGroup.h"
#include "Window.h" #include "Window.h"
@ -322,7 +323,7 @@ SATWindow::_InitGroup()
} }
SATWindow::GroupCookie::GroupCookie(SATWindow* satWindow) GroupCookie::GroupCookie(SATWindow* satWindow)
: :
fSATWindow(satWindow), fSATWindow(satWindow),
@ -349,14 +350,14 @@ SATWindow::GroupCookie::GroupCookie(SATWindow* satWindow)
} }
SATWindow::GroupCookie::~GroupCookie() GroupCookie::~GroupCookie()
{ {
Uninit(); Uninit();
} }
void void
SATWindow::GroupCookie::DoGroupLayout(SATWindow* triggerWindow) GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
{ {
if (!fSATGroup.Get()) if (!fSATGroup.Get())
return; return;
@ -400,7 +401,7 @@ SATWindow::GroupCookie::DoGroupLayout(SATWindow* triggerWindow)
void void
SATWindow::GroupCookie::MoveWindow(int32 workspace) GroupCookie::MoveWindow(int32 workspace)
{ {
Window* window = fSATWindow->GetWindow(); Window* window = fSATWindow->GetWindow();
Desktop* desktop = window->Desktop(); Desktop* desktop = window->Desktop();
@ -418,7 +419,7 @@ SATWindow::GroupCookie::MoveWindow(int32 workspace)
bool bool
SATWindow::GroupCookie::Init(SATGroup* group, WindowArea* area) GroupCookie::Init(SATGroup* group, WindowArea* area)
{ {
ASSERT(fSATGroup.Get() == NULL); ASSERT(fSATGroup.Get() == NULL);
@ -489,7 +490,7 @@ SATWindow::GroupCookie::Init(SATGroup* group, WindowArea* area)
void void
SATWindow::GroupCookie::Uninit() GroupCookie::Uninit()
{ {
delete leftBorder; delete leftBorder;
delete topBorder; delete topBorder;
@ -528,7 +529,7 @@ SATWindow::GroupCookie::Uninit()
bool bool
SATWindow::GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area) GroupCookie::PropagateToGroup(SATGroup* group, WindowArea* area)
{ {
if (!fSATGroup->fSATWindowList.RemoveItem(fSATWindow)) if (!fSATGroup->fSATWindowList.RemoveItem(fSATWindow))
return false; return false;

90
src/add-ons/decorators/SATDecorator/SATWindow.h
View File

@ -11,16 +11,60 @@
#include <Region.h> #include <Region.h>
#include "SATDecorator.h" #include "SATDecorator.h"
#include "SATGroup.h"
#include "Stacking.h" #include "Stacking.h"
#include "Tiling.h" #include "Tiling.h"
class Desktop; class Desktop;
class SATGroup;
class StackAndTile; class StackAndTile;
class Window; 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 { class SATWindow {
public: public:
SATWindow(StackAndTile* sat, Window* window); SATWindow(StackAndTile* sat, Window* window);
@ -70,50 +114,6 @@ private:
StackAndTile* fStackAndTile; StackAndTile* fStackAndTile;
Desktop* fDesktop; 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. //! Current group.
GroupCookie* fGroupCookie; GroupCookie* fGroupCookie;
/*! If the window is added to another group the own group is cached /*! If the window is added to another group the own group is cached

2
src/add-ons/decorators/SATDecorator/Tiling.cpp
View File

@ -437,8 +437,6 @@ SATTiling::_FreeAreaSize()
void void
SATTiling::_HighlightWindows(SATGroup* group, bool highlight) SATTiling::_HighlightWindows(SATGroup* group, bool highlight)
{ {
BRect windowFrame = fSATWindow->CompleteWindowFrame();
const TabList* hTabs = group->HorizontalTabs(); const TabList* hTabs = group->HorizontalTabs();
const TabList* vTabs = group->VerticalTabs(); const TabList* vTabs = group->VerticalTabs();
// height light windows at all four sites // height light windows at all four sites