[haiku-commits] r36930 - haiku/branches/features/stack-and-tile/src/servers/app
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 25 May 2010 00:27:55 +0200 (CEST)
Author: czeidler
Date: 2010-05-25 00:27:55 +0200 (Tue, 25 May 2010)
New Revision: 36930
Changeset: http://dev.haiku-os.org/changeset/36930/haiku
Modified:
haiku/branches/features/stack-and-tile/src/servers/app/Desktop.h
haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.cpp
haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.h
Log:
Make more SATWindow functions private. Remove leftover in Desktop.h.
Modified: haiku/branches/features/stack-and-tile/src/servers/app/Desktop.h
===================================================================
--- haiku/branches/features/stack-and-tile/src/servers/app/Desktop.h
2010-05-24 21:44:16 UTC (rev 36929)
+++ haiku/branches/features/stack-and-tile/src/servers/app/Desktop.h
2010-05-24 22:27:55 UTC (rev 36930)
@@ -91,8 +91,6 @@
class DesktopObservable
{
public:
- DesktopObservable();
-
void
RegisterListener(DesktopListener* listener);
void
UnregisterListener(DesktopListener* listener);
Modified:
haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.cpp
===================================================================
--- haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.cpp
2010-05-24 21:44:16 UTC (rev 36929)
+++ haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.cpp
2010-05-24 22:27:55 UTC (rev 36930)
@@ -318,7 +318,7 @@
_CheckIfReadyToSnap();
_StackWindow();
_SnapWindow();
- StackAndTile();
+ _StackAndTile();
FinishStackingAndSnapping();
//Activate this window so that others stacked/tiled along with
it
@@ -342,7 +342,7 @@
_CheckIfReadyToStack();
_CheckIfReadyToSnap();
} else
- StackAndTile();
+ _StackAndTile();
}
@@ -359,7 +359,7 @@
_RemoveSnappingPersistently();
_CheckIfReadyToSnap();
} else
- StackAndTile();
+ _StackAndTile();
}
@@ -475,7 +475,7 @@
SATWindow* windowToStackUnderSAT
=
fStackAndTile->GetSATWindow(windowToStackUnder);
if (windowToStackUnderSAT)
- windowToStackUnderSAT->StackAndTile();
+ windowToStackUnderSAT->_StackAndTile();
}
else
InitStackedWindowIds();
@@ -524,7 +524,7 @@
_SnapWindowFromSettings("snap bottom2bottom", SNAP_BOTTOM, SNAP_BOTTOM,
&settings);
- StackAndTile();
+ _StackAndTile();
STRACE_SAT(("Finished DefaultDecorator::SetSettings() on %s\n",
fWindow->Title()));
@@ -926,7 +926,7 @@
SATWindow* winSAT = _FindWindow(*id);
if (winSAT) {
_EnsureWindowWithinScreenBounds(winSAT, this);
- winSAT->StackAndTile();
+ winSAT->_StackAndTile();
}
}
}
@@ -1988,9 +1988,9 @@
the windows that are stacked with this window.
*/
void
-SATWindow::StackAndTile()
+SATWindow::_StackAndTile()
{
- STRACE_SAT(("Window::StackAndTile() on %s,
fWindow->Desktop()->fStackAndTileSpec=%x\n",
+ STRACE_SAT(("Window::_StackAndTile() on %s,
fWindow->Desktop()->fStackAndTileSpec=%x\n",
fWindow->Title(), fStackAndTile->GetLinearSpec()));
// works only if stack and tile is active for this window
@@ -2082,7 +2082,7 @@
debug_printf("\n");
delete specStr;
#endif
- STRACE_SAT(("Finished Window::StackAndTile() on %s\n",
fWindow->Title()));
+ STRACE_SAT(("Finished Window::_StackAndTile() on %s\n",
fWindow->Title()));
}
Modified: haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.h
===================================================================
--- haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.h
2010-05-24 21:44:16 UTC (rev 36929)
+++ haiku/branches/features/stack-and-tile/src/servers/app/StackAndTile.h
2010-05-24 22:27:55 UTC (rev 36930)
@@ -87,17 +87,22 @@
bool SetSettings(const BMessage&
settings);
bool GetSettings(BMessage* settings)
const;
- void StackAndTile();
- void StackWindowBefore(Window*
window);
- void FinishStackingAndSnapping();
+
BList* StackedWindows() const
{ return
fStackedWindows; }
+ void FinishStackingAndSnapping();
+
+ private:
+ void _StackAndTile();
+
+ void StackWindowBefore(Window*
window);
+
+ void SetWindowId(int32 windowId);
int32 WindowId();
Window* GetWindow();
BString Title();
BRect Frame();
- void SetWindowId(int32 windowId);
BList* StackedWindowIds() const
{ return
fStackedWindowIds; }
void InitStackedWindowIds();
@@ -137,7 +142,6 @@
BList* Bottom2TopSnappingWindowIds()
const
{ return
fBottom2TopSnappingWindowIds; }
- private:
void _InitStackingAndSnapping();
void _RemoveStackingAndSnapping();
Other related posts:
- » [haiku-commits] r36930 - haiku/branches/features/stack-and-tile/src/servers/app - clemens . zeidler