Merge lp:~ruben-verweij/unity/fix-677594-workspaces into lp:unity

[Ruben Verweij]

Fix launchpad bug 677594 so the Workspace switcher is not shown when there is only one workspace. This uses GConf to check if the number of workspaces Compiz uses is greater than 1.

[Sam Spilsbury (smspillaz)]

Hi,

You don't need to use gconf to do this, you can just ask compiz directly for the number of workspaces with screen->vpSize ().width ();

Also if you want to be notified when this number changes you can implement a

bool
UnityScreen::setOptionForPlugin (const char *plugin, const char *name, CompOption::Value &v) and make sure that UnityScreen inherits ScreenInterface (and that we call ScreenInterface::setHandler (screen) in the UnityScreen construtor) and then check for plugin == "core" and name == "hsize" and react on that change.

See git.compiz.org/compiz/core/plugins/cube/src/cube.cpp:1622 for some ideas on this.

Remind me that this method is full of suck and I need to change it.

[Neil J. Patel (njpatel)]

As per sams comment

review: Needs Fixing

=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2010-12-07 23:19:18 +0000
+++ src/LauncherController.cpp	2010-12-09 20:02:20 +0000
@@ -39,7 +39,12 @@
   _favorite_store = FavoriteStore::GetDefault ();
 
   g_timeout_add (5000, (GSourceFunc) &LauncherController::BamfTimerCallback, this);
-  InsertExpoAction ();
+  
+  _num_workspaces = _screen->vpSize ().width ();
+  if(_num_workspaces > 1)
+  {
+    InsertExpoAction ();
+  }
   InsertTrash ();
 }
 
@@ -86,6 +91,21 @@
 }
 
 void
+LauncherController::UpdateNumWorkspaces (int workspaces)
+{
+  if ((_num_workspaces == 0) && (workspaces > 0))
+  {
+    InsertExpoAction ();
+  }
+  else if((_num_workspaces > 0) && (workspaces == 0))
+  {
+    RemoveExpoAction ();
+  }
+  
+  _num_workspaces = workspaces;
+}
+
+void
 LauncherController::InsertTrash ()
 {
   TrashLauncherIcon *icon;
@@ -96,18 +116,23 @@
 void
 LauncherController::InsertExpoAction ()
 {
-  SimpleLauncherIcon *expoIcon;
-  expoIcon = new SimpleLauncherIcon (_launcher);
-  
-  expoIcon->SetTooltipText ("Workspace Switcher");
-  expoIcon->SetIconName ("workspace-switcher");
-  expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
-  expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
-  expoIcon->SetIconType (LAUNCHER_ICON_TYPE_END);
-  
-  expoIcon->MouseClick.connect (sigc::mem_fun (this, &LauncherController::OnExpoClicked));
-  
-  RegisterIcon (expoIcon);
+  _expoIcon = new SimpleLauncherIcon (_launcher);
+  
+  _expoIcon->SetTooltipText ("Workspace Switcher");
+  _expoIcon->SetIconName ("workspace-switcher");
+  _expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
+  _expoIcon->SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
+  _expoIcon->SetIconType (LAUNCHER_ICON_TYPE_END);
+  
+  _expoIcon->MouseClick.connect (sigc::mem_fun (this, &LauncherController::OnExpoClicked));
+  
+  RegisterIcon (_expoIcon);
+}
+
+void
+LauncherController::RemoveExpoAction ()
+{
+  _model->RemoveIcon (_expoIcon);
 }
 
 bool

=== modified file 'src/LauncherController.h'
--- src/LauncherController.h	2010-11-25 01:49:19 +0000
+++ src/LauncherController.h	2010-12-09 20:02:20 +0000
@@ -46,16 +46,19 @@
     void PresentIconOwningWindow (Window window);
     
 private:
-    BamfMatcher*     _matcher;
-    CompAction*      _expo_action;
-    CompScreen*      _screen;
-    Launcher*        _launcher;
-    LauncherModel*   _model;
-    nux::BaseWindow* _window;
-    FavoriteStore*   _favorite_store;
-    int              _sort_priority;
+    BamfMatcher*        _matcher;
+    CompAction*         _expo_action;
+    CompScreen*         _screen;
+    Launcher*           _launcher;
+    LauncherModel*      _model;
+    nux::BaseWindow*    _window;
+    FavoriteStore*      _favorite_store;
+    SimpleLauncherIcon* _expoIcon;
+    int                 _sort_priority;
+    int                 _num_workspaces;
 
     void InsertExpoAction ();
+    void RemoveExpoAction ();
     
     void InsertTrash ();
 
@@ -67,6 +70,8 @@
 
     void OnExpoClicked (int button);
     
+    void UpdateNumWorkspaces(int workspaces);
+    
     /* statics */
     
     static bool CompareIcons (LauncherIcon *first, LauncherIcon *second);

=== modified file 'src/unity.cpp'
--- src/unity.cpp	2010-12-09 17:56:23 +0000
+++ src/unity.cpp	2010-12-09 20:02:20 +0000
@@ -388,6 +388,7 @@
   }
 }
 
+<<<<<<< TREE
 static gboolean
 write_logger_data_to_disk (gpointer data)
 {
@@ -395,6 +396,26 @@
   return FALSE;
 }
 
+=======
+/* Handle changes in the number of workspaces by showing the switcher
+ * or not showing the switcher */
+bool
+UnityScreen::setOptionForPlugin(const char *plugin, const char *name, 
+                                CompOption::Value &v)
+{
+  bool status;
+  status = screen->setOptionForPlugin (plugin, name, v);
+  if (status)
+  {
+    if (strcmp (plugin, "core") == 0 && strcmp (name, "hsize") == 0)
+    {
+      controller->UpdateNumWorkspaces(screen->vpSize ().width ());
+    }
+  }
+  return status;
+}
+
+>>>>>>> MERGE-SOURCE
 UnityScreen::UnityScreen (CompScreen *screen) :
     PluginClassHandler <UnityScreen, CompScreen> (screen),
     screen (screen),

=== modified file 'src/unity.h'
--- src/unity.h	2010-12-06 23:36:00 +0000
+++ src/unity.h	2010-12-09 20:02:20 +0000
@@ -93,6 +93,11 @@
 	/* handle option changes and change settings inside of the
 	 * panel and dock views */
 	void optionChanged (CompOption *, Options num);
+	
+	/* Handle changes in the number of workspaces by showing the switcher
+     * or not showing the switcher */
+	bool setOptionForPlugin(const char *plugin, const char *name, 
+                            CompOption::Value &v);
 
 	/* init plugin actions for screen */
 	bool initPluginForScreen (CompPlugin *p);