Ticket #8156: Workspaces.patch

src/apps/workspaces/Workspaces.cpp

@@ -14 +14 @@
 #include <Alert.h>
 #include <Application.h>
 #include <Catalog.h>
+#include <Deskbar.h>
 #include <Dragger.h>
 #include <Entry.h>
 #include <File.h>
@@ -40 +41 @@
 #define B_TRANSLATE_CONTEXT "Workspaces"
 
 
+static const char* kDeskbarItemName = "workspaces";
 static const char* kSignature = "application/x-vnd.Be-WORK";
+static const char* kDeskbarSignature = "application/x-vnd.Be-TSKB";
 static const char* kScreenPrefletSignature = "application/x-vnd.Haiku-Screen";
 static const char* kOldSettingFile = "Workspace_data";
 static const char* kSettingsFile = "Workspaces_settings";
@@ -50 +53 @@
 static const uint32 kMsgToggleBorder = 'tgBd';
 static const uint32 kMsgToggleAutoRaise = 'tgAR';
 static const uint32 kMsgToggleAlwaysOnTop = 'tgAT';
+static const uint32 kMsgToggleLiveInDeskbar = 'tgDb';
 
 static const float kScreenBorderOffset = 10.0;
 
+extern "C" _EXPORT BView* instantiate_deskbar_item();
 
 class WorkspacesSettings {
     public:
@@ -89 +94 @@
 
 class WorkspacesView : public BView {
     public:
-        WorkspacesView(BRect frame);
+        WorkspacesView(BRect frame, bool showDragger);
         WorkspacesView(BMessage* archive);
         ~WorkspacesView();
 
@@ -331 +336 @@
 //  #pragma mark -
 
 
-WorkspacesView::WorkspacesView(BRect frame)
+WorkspacesView::WorkspacesView(BRect frame, bool showDragger=true)
     :
-    BView(frame, "workspaces", B_FOLLOW_ALL,
+    BView(frame, kDeskbarItemName, B_FOLLOW_ALL,
         kWorkspacesViewFlag | B_FRAME_EVENTS),
     fParentWhichDrawsOnChildren(NULL),
     fCurrentFrame(frame)
 {
-    frame.OffsetTo(B_ORIGIN);
-    frame.top = frame.bottom - 7;
-    frame.left = frame.right - 7;
-    BDragger* dragger = new BDragger(frame, this,
-        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    AddChild(dragger);
+    if(showDragger) {
+        frame.OffsetTo(B_ORIGIN);
+        frame.top = frame.bottom - 7;
+        frame.left = frame.right - 7;
+        BDragger* dragger = new BDragger(frame, this,
+            B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+        AddChild(dragger);
+    }
 }
 
 
@@ -576 +583 @@
             new BMessage(kMsgToggleAutoRaise)));
         if (window->IsAutoRaising())
             item->SetMarked(true);
+        if (be_roster->IsRunning(kDeskbarSignature)) {
+            menu->AddItem(item = new BMenuItem(B_TRANSLATE("Live in the Deskbar"),
+            new BMessage(kMsgToggleLiveInDeskbar)));
+            BDeskbar deskbar;
+            item->SetMarked(deskbar.HasItem(kDeskbarItemName));
+        }
 
         menu->AddSeparatorItem();
         menu->AddItem(new BMenuItem(B_TRANSLATE("About Workspaces" 
@@ -772 +785 @@
             fSettings->SetAlwaysOnTop(enable);
             break;
         }
+        
+        case kMsgToggleLiveInDeskbar:
+        {
+            BDeskbar deskbar;
+            if (deskbar.HasItem (kDeskbarItemName))
+                deskbar.RemoveItem (kDeskbarItemName);
+            else {
+                entry_ref ref;
+                be_roster->FindApp(kSignature, &ref);
+                deskbar.AddItem(&ref);
+            }
+            break;
+        }
 
         default:
             BWindow::MessageReceived(message);
@@ -904 +930 @@
 }
 
 
+BView* instantiate_deskbar_item()
+{
+    return new WorkspacesView(BRect (0, 0, 75, 15), false);
+}
+
+
 void
 WorkspacesApp::ReadyToRun()
 {