Author: czeidler Date: 2010-08-13 01:06:11 +0200 (Fri, 13 Aug 2010) New Revision: 38073 Changeset: http://dev.haiku-os.org/changeset/38073 Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.cpp haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.h Log: Use new listener interface. Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.cpp =================================================================== --- haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.cpp 2010-08-12 23:05:31 UTC (rev 38072) +++ haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.cpp 2010-08-12 23:06:11 UTC (rev 38073) @@ -41,7 +41,7 @@ WindowList& windows = desktop->AllWindows(); for (Window *window = windows.FirstWindow(); window != NULL; window = window->NextWindow(kAllWindowList)) - AddWindow(window); + WindowAdded(window); } @@ -58,7 +58,7 @@ void -StackAndTile::AddWindow(Window* window) +StackAndTile::WindowAdded(Window* window) { SATWindow* satWindow = new (std::nothrow)SATWindow(this, window); if (!satWindow) @@ -70,7 +70,7 @@ void -StackAndTile::RemoveWindow(Window* window) +StackAndTile::WindowRemoved(Window* window) { STRACE_SAT("StackAndTile::WindowRemoved %s\n", window->Title()); @@ -86,7 +86,7 @@ void -StackAndTile::KeyEvent(uint32 what, int32 key, int32 modifiers) +StackAndTile::KeyPressed(uint32 what, int32 key, int32 modifiers) { // switch to and from stacking and snapping mode if (what == B_MODIFIERS_CHANGED) { @@ -138,7 +138,7 @@ void -StackAndTile::MoveWindow(Window* window) +StackAndTile::WindowMoved(Window* window) { SATWindow* satWindow = GetSATWindow(window); if (!satWindow) @@ -152,14 +152,14 @@ void -StackAndTile::ResizeWindow(Window* window) +StackAndTile::WindowResized(Window* window) { - MoveWindow(window); + WindowMoved(window); } void -StackAndTile::ActivateWindow(Window* window) +StackAndTile::WindowActitvated(Window* window) { SATWindow* satWindow = GetSATWindow(window); if (!satWindow) @@ -170,7 +170,7 @@ void -StackAndTile::SendWindowBehind(Window* window, Window* behindOf) +StackAndTile::WindowSentBehind(Window* window, Window* behindOf) { SATWindow* satWindow = GetSATWindow(window); if (!satWindow) @@ -191,7 +191,7 @@ void -StackAndTile::SetWindowWorkspaces(Window* window, uint32 workspaces) +StackAndTile::WindowWorkspacesChanged(Window* window, uint32 workspaces) { SATWindow* satWindow = GetSATWindow(window); if (!satWindow) @@ -212,22 +212,8 @@ void -StackAndTile::ShowWindow(Window* window) +StackAndTile::WindowMinimized(Window* window, bool minimize) { - -} - - -void -StackAndTile::HideWindow(Window* window) -{ - -} - - -void -StackAndTile::MinimizeWindow(Window* window, bool minimize) -{ SATWindow* satWindow = GetSATWindow(window); if (!satWindow) return; @@ -247,7 +233,7 @@ void -StackAndTile::SetWindowTabLocation(Window* window, float location) +StackAndTile::WindowTabLocationChanged(Window* window, float location) { SATWindow* satWindow = GetSATWindow(window); if (!satWindow) Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.h =================================================================== --- haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.h 2010-08-12 23:05:31 UTC (rev 38072) +++ haiku/trunk/src/add-ons/decorators/SATDecorator/StackAndTile.h 2010-08-12 23:06:11 UTC (rev 38073) @@ -44,10 +44,10 @@ virtual void ListenerRegistered(Desktop* desktop); virtual void ListenerUnregistered(); - virtual void AddWindow(Window* window); - virtual void RemoveWindow(Window* window); + virtual void WindowAdded(Window* window); + virtual void WindowRemoved(Window* window); - virtual void KeyEvent(uint32 what, int32 key, + virtual void KeyPressed(uint32 what, int32 key, int32 modifiers); virtual void MouseEvent(BMessage* message) {} virtual void MouseDown(Window* window, BMessage* message, @@ -57,18 +57,15 @@ virtual void MouseMoved(Window* window, BMessage* message, const BPoint& where) {} - virtual void MoveWindow(Window* window); - virtual void ResizeWindow(Window* window); - virtual void ActivateWindow(Window* window); - virtual void SendWindowBehind(Window* window, - Window* behindOf); - virtual void SetWindowWorkspaces(Window* window, + virtual void WindowMoved(Window* window); + virtual void WindowResized(Window* window); + virtual void WindowActitvated(Window* window); + virtual void WindowSentBehind(Window* window, Window* behindOf); + virtual void WindowWorkspacesChanged(Window* window, uint32 workspaces); - virtual void ShowWindow(Window* window); - virtual void HideWindow(Window* window); - virtual void MinimizeWindow(Window* window, bool minimize); + virtual void WindowMinimized(Window* window, bool minimize); - virtual void SetWindowTabLocation(Window* window, + virtual void WindowTabLocationChanged(Window* window, float location); virtual bool SetDecoratorSettings(Window* window,