From 5ce919497d2cc9aaa6d1f8f7dabb1007567812ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 21 Aug 2009 10:28:46 +0000 Subject: [PATCH] * The changed settings format (display mode instead of composed fields) actually broke Desktop::WorkspaceFrame(), which I didn't notice before; Workspaces now shows everything in the right dimensions, even if resolutions differ. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32560 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 7 +------ src/servers/app/WorkspacesView.cpp | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 013b173914..a2bbdafd4f 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -889,14 +889,9 @@ Desktop::WorkspaceFrame(int32 index) const frame = fVirtualScreen.Frame(); else if (index >= 0 && index < fSettings->WorkspacesCount()) { BMessage screenData; - int32 width; - int32 height; fSettings->WorkspacesMessage(index)->FindMessage("screen", &screenData); - if (screenData.FindInt32("width", &width) != B_OK - || screenData.FindInt32("height", &height) != B_OK) + if (screenData.FindRect("frame", &frame) != B_OK) frame = fVirtualScreen.Frame(); - else - frame.Set(0.0, 0.0, width - 1, height - 1); } return frame; } diff --git a/src/servers/app/WorkspacesView.cpp b/src/servers/app/WorkspacesView.cpp index 43c82b6d39..c8495fc1a2 100644 --- a/src/servers/app/WorkspacesView.cpp +++ b/src/servers/app/WorkspacesView.cpp @@ -22,7 +22,8 @@ WorkspacesView::WorkspacesView(BRect frame, BPoint scrollingOffset, const char* name, int32 token, uint32 resizeMode, uint32 flags) - : View(frame, scrollingOffset, name, token, resizeMode, flags), + : + View(frame, scrollingOffset, name, token, resizeMode, flags), fSelectedWindow(NULL), fSelectedWorkspace(-1), fHasMoved(false)