[haiku-commits] r42539 - in haiku/trunk/src/servers/app: . stackandtile
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 2 Aug 2011 08:46:12 +0200 (CEST)
Author: czeidler
Date: 2011-08-02 08:46:11 +0200 (Tue, 02 Aug 2011)
New Revision: 42539
Changeset: https://dev.haiku-os.org/changeset/42539
Added:
haiku/trunk/src/servers/app/stackandtile/
Removed:
haiku/trunk/src/servers/app/StackAndTile/
Modified:
haiku/trunk/src/servers/app/Jamfile
haiku/trunk/src/servers/app/stackandtile/Jamfile
haiku/trunk/src/servers/app/stackandtile/SATGroup.cpp
haiku/trunk/src/servers/app/stackandtile/SATGroup.h
Log:
Fix coding style pointed out by Axel. Thanks for the array trick haven't known
this one :-)
Modified: haiku/trunk/src/servers/app/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/Jamfile 2011-08-02 06:07:49 UTC (rev 42538)
+++ haiku/trunk/src/servers/app/Jamfile 2011-08-02 06:46:11 UTC (rev 42539)
@@ -5,7 +5,7 @@
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
-UseHeaders [ FDirName $(HAIKU_TOP) src servers app StackAndTile ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
UseFreeTypeHeaders ;
@@ -81,7 +81,7 @@
:
libtranslation.so libbe.so libbnetapi.so
libasdrawing.a libasremote.a libpainter.a libagg.a libfreetype.so
- StackAndTile.a liblinprog.a libtextencoding.so libshared.a
+ libstackandtile.a liblinprog.a libtextencoding.so libshared.a
$(TARGET_LIBSTDC++)
: app_server.rdef
@@ -92,4 +92,4 @@
SubInclude HAIKU_TOP src servers app drawing ;
-SubInclude HAIKU_TOP src servers app StackAndTile ;
+SubInclude HAIKU_TOP src servers app stackandtile ;
Modified: haiku/trunk/src/servers/app/stackandtile/Jamfile
===================================================================
--- haiku/trunk/src/servers/app/StackAndTile/Jamfile 2011-08-02 06:07:49 UTC
(rev 42538)
+++ haiku/trunk/src/servers/app/stackandtile/Jamfile 2011-08-02 06:46:11 UTC
(rev 42539)
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src servers app StackAndTile ;
+SubDir HAIKU_TOP src servers app stackandtile ;
UseLibraryHeaders agg lp_solve linprog ;
UsePrivateHeaders app graphics interface shared kernel ;
@@ -10,7 +10,7 @@
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
UseFreeTypeHeaders ;
-StaticLibrary StackAndTile.a :
+StaticLibrary libstackandtile.a :
SATDecorator.cpp
SATGroup.cpp
SATWindow.cpp
Modified: haiku/trunk/src/servers/app/stackandtile/SATGroup.cpp
===================================================================
--- haiku/trunk/src/servers/app/StackAndTile/SATGroup.cpp 2011-08-02
06:07:49 UTC (rev 42538)
+++ haiku/trunk/src/servers/app/stackandtile/SATGroup.cpp 2011-08-02
06:46:11 UTC (rev 42539)
@@ -66,17 +66,8 @@
WindowArea::MoveWindowToPosition(SATWindow* window, int32 index)
{
int32 oldIndex = fWindowList.IndexOf(window);
- if (oldIndex < 0)
- return false;
ASSERT(oldIndex != index);
- if (oldIndex < index)
- index++;
- else
- oldIndex++;
- if (!fWindowList.AddItem(window, index))
- return false;
- fWindowList.RemoveItemAt(oldIndex);
- return true;
+ return fWindowList.MoveItem(oldIndex, index);
}
@@ -94,8 +85,7 @@
int32 indexAfter = fWindowList.IndexOf(after);
if (!fWindowList.AddItem(window, indexAfter + 1))
return false;
- }
- else if (!fWindowList.AddItem(window))
+ } else if (fWindowList.AddItem(window) == false)
return false;
AcquireReference();
@@ -361,10 +351,17 @@
Corner*
Crossing::GetCorner(Corner::position_t corner) const
{
- return _GetCorner(corner);
+ return &const_cast<Corner*>(fCorners)[corner];
}
+Corner*
+Crossing::GetOppositeCorner(Corner::position_t corner) const
+{
+ return &const_cast<Corner*>(fCorners)[3 - corner];
+}
+
+
Tab*
Crossing::VerticalTab() const
{
@@ -383,50 +380,16 @@
Crossing::Trace() const
{
STRACE_SAT("left-top corner: ");
- fLeftTop.Trace();
+ fCorners[Corner::kLeftTop].Trace();
STRACE_SAT("right-top corner: ");
- fRightTop.Trace();
+ fCorners[Corner::kRightTop].Trace();
STRACE_SAT("left-bottom corner: ");
- fLeftBottom.Trace();
+ fCorners[Corner::kLeftBottom].Trace();
STRACE_SAT("right-bottom corner: ");
- fRightBottom.Trace();
+ fCorners[Corner::kRightBottom].Trace();
}
-Corner*
-Crossing::_GetCorner(Corner::position_t corner) const
-{
- switch (corner) {
- case Corner::kLeftTop:
- return const_cast<Corner*>(&fLeftTop);
- case Corner::kRightTop:
- return const_cast<Corner*>(&fRightTop);
- case Corner::kLeftBottom:
- return const_cast<Corner*>(&fLeftBottom);
- case Corner::kRightBottom:
- return const_cast<Corner*>(&fRightBottom);
- };
- return NULL;
-}
-
-
-Corner*
-Crossing::GetOppositeCorner(Corner::position_t corner) const
-{
- switch (corner) {
- case Corner::kLeftTop:
- return const_cast<Corner*>(&fRightBottom);
- case Corner::kRightTop:
- return const_cast<Corner*>(&fLeftBottom);
- case Corner::kLeftBottom:
- return const_cast<Corner*>(&fRightTop);
- case Corner::kRightBottom:
- return const_cast<Corner*>(&fLeftTop);
- };
- return NULL;
-}
-
-
Tab::Tab(SATGroup* group, Variable* variable, orientation_t orientation)
:
fGroup(group),
@@ -520,13 +483,15 @@
Tab::FindCrossingIndex(Tab* tab)
{
if (fOrientation == kVertical) {
- for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+ for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
if (fCrossingList.ItemAt(i)->HorizontalTab() == tab)
return i;
+ }
} else {
- for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+ for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
if (fCrossingList.ItemAt(i)->VerticalTab() == tab)
return i;
+ }
}
return -1;
}
@@ -536,13 +501,15 @@
Tab::FindCrossingIndex(float pos)
{
if (fOrientation == kVertical) {
- for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+ for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
if
(fCrossingList.ItemAt(i)->HorizontalTab()->Position() == pos)
return i;
+ }
} else {
- for (int32 i = 0; i < fCrossingList.CountItems(); i++)
+ for (int32 i = 0; i < fCrossingList.CountItems(); i++) {
if (fCrossingList.ItemAt(i)->VerticalTab()->Position()
== pos)
return i;
+ }
}
return -1;
}
Modified: haiku/trunk/src/servers/app/stackandtile/SATGroup.h
===================================================================
--- haiku/trunk/src/servers/app/StackAndTile/SATGroup.h 2011-08-02 06:07:49 UTC
(rev 42538)
+++ haiku/trunk/src/servers/app/stackandtile/SATGroup.h 2011-08-02 06:46:11 UTC
(rev 42539)
@@ -35,10 +35,10 @@
enum position_t
{
- kLeftTop,
- kRightTop,
- kLeftBottom,
- kRightBottom
+ kLeftTop = 0,
+ kRightTop = 1,
+ kLeftBottom = 2,
+ kRightBottom = 3
};
Corner();
@@ -58,23 +58,22 @@
Corner* GetOppositeCorner(
Corner::position_t corner) const;
- Corner* LeftTopCorner() {
return &fLeftTop; }
- Corner* RightTopCorner() {
return &fRightTop; }
- Corner* LeftBottomCorner() {
return &fLeftBottom; }
- Corner* RightBottomCorner() {
return &fRightBottom; }
+ Corner* LeftTopCorner()
+ {
return &fCorners[Corner::kLeftTop]; }
+ Corner* RightTopCorner()
+ {
return &fCorners[Corner::kRightTop]; }
+ Corner* LeftBottomCorner()
+ {
return &fCorners[Corner::kLeftBottom]; }
+ Corner* RightBottomCorner()
+ {
return &fCorners[Corner::kRightBottom]; }
Tab* VerticalTab() const;
Tab* HorizontalTab() const;
void Trace() const;
private:
- Corner* _GetCorner(Corner::position_t corner) const;
+ Corner fCorners[4];
- Corner fLeftTop;
- Corner fRightTop;
- Corner fLeftBottom;
- Corner fRightBottom;
-
Tab* fVerticalTab;
Tab* fHorizontalTab;
};
Other related posts:
- » [haiku-commits] r42539 - in haiku/trunk/src/servers/app: . stackandtile - clemens . zeidler
