[haiku-commits] haiku.r1alpha4: hrevr1alpha4-44686 - in src/servers/app: . stackandtile
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 7 Nov 2012 05:05:53 +0100 (CET)
hrevr1alpha4-44686 adds 1 changeset to branch 'r1alpha4'
old head: 4f47342978efad55606a995195eb3a467d22078f
new head: 85c13c54365e1d409d16d56236f93ab0b4dbfb14
----------------------------------------------------------------------------
85c13c5: Move stacked windows to a different workspace correctly.
When moving a window of a stacked window group to a different workspace all
windows in the stack have to be moved. This fixes #8855.
[ czeidler <haiku@xxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrevr1alpha4-44686
Commit: 85c13c54365e1d409d16d56236f93ab0b4dbfb14
URL: http://cgit.haiku-os.org/haiku/commit/?id=85c13c5
Author: czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date: Tue Nov 6 19:08:22 2012 UTC
Committer: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Wed Nov 7 04:03:06 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8855
----------------------------------------------------------------------------
2 files changed, 48 insertions(+), 24 deletions(-)
src/servers/app/Desktop.cpp | 61 +++++++++++++++--------
src/servers/app/stackandtile/StackAndTile.cpp | 11 ++--
----------------------------------------------------------------------------
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 3b280e2..7c74093 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1357,21 +1357,30 @@ Desktop::MoveWindowBy(Window* window, float x, float y,
int32 workspace)
AutoWriteLocker _(fWindowLock);
Window* topWindow = window->TopLayerStackWindow();
- if (topWindow)
+ if (topWindow != NULL)
window = topWindow;
if (workspace == -1)
workspace = fCurrentWorkspace;
if (!window->IsVisible() || workspace != fCurrentWorkspace) {
if (workspace != fCurrentWorkspace) {
- // move the window on another workspace - this doesn't
change it's
- // current position
- if (window->Anchor(workspace).position ==
kInvalidWindowPosition)
- window->Anchor(workspace).position =
window->Frame().LeftTop();
-
- window->Anchor(workspace).position += BPoint(x, y);
- window->SetCurrentWorkspace(workspace);
- _WindowChanged(window);
+ WindowStack* stack = window->GetWindowStack();
+ if (stack != NULL) {
+ for (int32 s = 0; s < stack->CountWindows();
s++) {
+ Window* stackWindow =
stack->WindowAt(s);
+ // move the window on another workspace
- this doesn't
+ // change it's current position
+ if
(stackWindow->Anchor(workspace).position
+ == kInvalidWindowPosition) {
+
stackWindow->Anchor(workspace).position
+ =
stackWindow->Frame().LeftTop();
+ }
+
+ stackWindow->Anchor(workspace).position
+= BPoint(x, y);
+
stackWindow->SetCurrentWorkspace(workspace);
+ _WindowChanged(stackWindow);
+ }
+ }
} else
window->MoveBy((int32)x, (int32)y);
@@ -1532,11 +1541,16 @@ Desktop::SetWindowWorkspaces(Window* window, uint32
workspaces)
if (window->IsNormal() && workspaces == B_CURRENT_WORKSPACE)
workspaces = workspace_to_workspaces(CurrentWorkspace());
- uint32 oldWorkspaces = window->Workspaces();
-
- window->WorkspacesChanged(oldWorkspaces, workspaces);
- _ChangeWindowWorkspaces(window, oldWorkspaces, workspaces);
+ WindowStack* stack = window->GetWindowStack();
+ if (stack != NULL) {
+ for (int32 s = 0; s < stack->CountWindows(); s++) {
+ window = stack->LayerOrder().ItemAt(s);
+ uint32 oldWorkspaces = window->Workspaces();
+ window->WorkspacesChanged(oldWorkspaces, workspaces);
+ _ChangeWindowWorkspaces(window, oldWorkspaces,
workspaces);
+ }
+ }
UnlockAllWindows();
}
@@ -3415,18 +3429,25 @@ Desktop::_SetWorkspace(int32 index, bool
moveFocusWindow)
// But only normal windows are following
uint32 oldWorkspaces =
movedWindow->Workspaces();
-
_Windows(previousIndex).RemoveWindow(movedWindow);
- _Windows(index).AddWindow(movedWindow,
-
movedWindow->Frontmost(_Windows(index).FirstWindow(),
- index));
+ WindowStack* stack =
movedWindow->GetWindowStack();
+ if (stack != NULL) {
+ for (int32 s = 0; s <
stack->CountWindows(); s++) {
+ Window* stackWindow =
stack->LayerOrder().ItemAt(s);
+
_Windows(previousIndex).RemoveWindow(stackWindow);
+
_Windows(index).AddWindow(stackWindow,
+ stackWindow->Frontmost(
+
_Windows(index).FirstWindow(), index));
+
+ // send B_WORKSPACES_CHANGED
message
+
stackWindow->WorkspacesChanged(oldWorkspaces,
+
stackWindow->Workspaces());
+ }
+ }
// TODO: subset windows will always flicker
this way
movedMouseEventWindow = true;
- // send B_WORKSPACES_CHANGED message
- movedWindow->WorkspacesChanged(oldWorkspaces,
- movedWindow->Workspaces());
NotifyWindowWorkspacesChanged(movedWindow,
movedWindow->Workspaces());
} else {
diff --git a/src/servers/app/stackandtile/StackAndTile.cpp
b/src/servers/app/stackandtile/StackAndTile.cpp
index 8568f71..40de054 100644
--- a/src/servers/app/stackandtile/StackAndTile.cpp
+++ b/src/servers/app/stackandtile/StackAndTile.cpp
@@ -368,10 +368,13 @@ StackAndTile::WindowWorkspacesChanged(Window* window,
uint32 workspaces)
if (desktop == NULL)
return;
- for (int i = 0; i < group->CountItems(); i++) {
- SATWindow* listWindow = group->WindowAt(i);
- if (listWindow != satWindow)
- desktop->SetWindowWorkspaces(listWindow->GetWindow(),
workspaces);
+ const WindowAreaList& areaList = group->GetAreaList();
+ for (int32 i = 0; i < areaList.CountItems(); i++) {
+ WindowArea* area = areaList.ItemAt(i);
+ if (area->WindowList().HasItem(satWindow))
+ continue;
+ SATWindow* topWindow = area->TopWindow();
+ desktop->SetWindowWorkspaces(topWindow->GetWindow(),
workspaces);
}
}
Other related posts:
- » [haiku-commits] haiku.r1alpha4: hrevr1alpha4-44686 - in src/servers/app: . stackandtile - kallisti5
