Ticket #8365: workspaceszoom1.2.patch

src/apps/workspaces/Workspaces.cpp

@@ -55 +55 @@
 static const uint32 kMsgToggleAutoRaise = 'tgAR';
 static const uint32 kMsgToggleAlwaysOnTop = 'tgAT';
 static const uint32 kMsgToggleLiveInDeskbar = 'tgDb';
-
+static const uint32 kMsgWorkspaceLayoutChanged = 'wslc'; //From Screen preflet
 
 extern "C" _EXPORT BView* instantiate_deskbar_item();
 
@@ -156 +156 @@
 
         virtual void AboutRequested();
         virtual void ArgvReceived(int32 argc, char **argv);
+        virtual void MessageReceived(BMessage *message);
         virtual void ReadyToRun();
 
         void Usage(const char *programName);
@@ -757 +758 @@
     height = floor(workspaceHeight * rows);
 
     while (width + 2 * GetScreenBorderOffset() > screenWidth
-        || height + 2 * GetScreenBorderOffset() + GetTabHeight() > screenHeight) {
+        || height + 2 * GetScreenBorderOffset() + GetTabHeight() > screenHeight)    {
         width = floor(0.95 * width);
         height = floor(0.95 * height);
     }
 
     ResizeTo(width, height);
-
-    origin = screen.Frame().RightBottom();
-    origin.x -= GetScreenBorderOffset() + width;
-    origin.y -= GetScreenBorderOffset() + height;
-
-    MoveTo(origin);
 }
 
 
@@ -859 +854 @@
             break;
         }
 
+        case kMsgWorkspaceLayoutChanged:
+        {
+            float width = Frame().right - Frame().left;
+            float height = Frame().bottom - Frame().top;
+            Zoom(BPoint(0,0), width, height);
+            break;
+        }
+
         default:
             BWindow::MessageReceived(message);
             break;
@@ -1029 +1032 @@
     fWindow->Show();
 }
 
+void
+WorkspacesApp::MessageReceived(BMessage *message)
+{
+    switch (message->what) {
+        case kMsgWorkspaceLayoutChanged:
+        {
+            fWindow->MessageReceived(message);
+            break;
+        }
+        default:
+            BApplication::MessageReceived(message);
+            break;
+    };
+}
 
 //  #pragma mark -
 
-
 int
 main(int argc, char **argv)
 {

src/preferences/screen/Constants.h

@@ -43 +43 @@
 
 // Constants
 extern const char* kBackgroundsSignature;
+extern const char* kWorkspacesSignature;
 
 static const int32 gMinRefresh = 45;    // This is the minimum selectable refresh
 static const int32 gMaxRefresh = 140;   // This is the maximum selectable refresh

src/preferences/screen/ScreenWindow.cpp

@@ -67 +67 @@
 
 
 const char* kBackgroundsSignature = "application/x-vnd.Haiku-Backgrounds";
+const char* kWorkspacesSignature = "application/x-vnd.Be-WORK";
 
 // list of officially supported colour spaces
 static const struct {
@@ -827 +828 @@
     _GetColumnRowButton(false, true)->SetEnabled(columns * (rows + 1) < 32);
 }
 
+void
+ScreenWindow::_UpdateWorkspaceWindow()
+{
+    BMessage msg(kMsgWorkspaceLayoutChanged); //Workspace Layout Changed
+    BMessenger messenger(kWorkspacesSignature,-1);
+    messenger.SendMessage(&msg);
+}
+
 
 void
 ScreenWindow::ScreenChanged(BRect frame, color_space mode)
@@ -878 +887 @@
             BPrivate::set_workspaces_layout(newColumns, newRows);
 
             _UpdateWorkspaceButtons();
+            _UpdateWorkspaceWindow();
             _CheckApplyEnabled();
             break;
         }

src/preferences/screen/ScreenWindow.h

@@ -51 +51 @@
 
             void            _UpdateActiveMode();
             void            _UpdateWorkspaceButtons();
+            void            _UpdateWorkspaceWindow();
             void            _UpdateRefreshControl();
             void            _UpdateMonitorView();
             void            _UpdateControls();