Merge lp:~3v1n0/unity/expo-dnd-removal into lp:unity

[Marco Trevisan (Treviño)]

ExpoLauncherIcon: Set the viewport size to 1,1 (i.e. diable workspaces) on icon Removal

Like when dragged to trash!

This is the last part of the so awaited saga "Launcher - Workspace switcher should not be in the Launcher by default".

Now dragging the WS icon to the trash, disables the workspaces.

It requires the compiz fix lp:~3v1n0/compiz/ccp-core-options-save-fix/+merge/147716 in order to work after a compiz reboot (i.e. to actually save the setting)

Tests added.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2012-12-03 16:09:51 +0000
+++ launcher/ExpoLauncherIcon.cpp	2013-02-11 17:32:24 +0000
@@ -66,6 +66,11 @@
   }
 }
 
+void ExpoLauncherIcon::AboutToRemove()
+{
+  WindowManager::Default().SetViewportSize(1, 1);
+}
+
 void ExpoLauncherIcon::UpdateIcon()
 {
   auto const& vp = WindowManager::Default().GetCurrentViewport();

=== modified file 'launcher/ExpoLauncherIcon.h'
--- launcher/ExpoLauncherIcon.h	2012-12-03 15:34:23 +0000
+++ launcher/ExpoLauncherIcon.h	2013-02-11 17:32:24 +0000
@@ -32,6 +32,7 @@
 public:
   ExpoLauncherIcon();
   void Stick(bool save);
+  void AboutToRemove();
 
 protected:
   void ActivateLauncherIcon(ActionArg arg);

=== modified file 'tests/test_expo_launcher_icon.cpp'
--- tests/test_expo_launcher_icon.cpp	2012-12-03 16:09:51 +0000
+++ tests/test_expo_launcher_icon.cpp	2013-02-11 17:32:24 +0000
@@ -71,14 +71,14 @@
   wm->SetCurrentViewport(nux::Point(0, 1));
   wm->screen_viewport_switch_ended.emit();
   EXPECT_EQ(icon.icon_name, "workspace-switcher-left-bottom");
-  
+
   wm->SetCurrentViewport(nux::Point(1, 1));
   wm->screen_viewport_switch_ended.emit();
   EXPECT_EQ(icon.icon_name, "workspace-switcher-right-bottom");
 
   wm->SetCurrentViewport(nux::Point(0, 0));
   wm->screen_viewport_switch_ended.emit();
-  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left"); 
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
 }
 
 TEST_F(TestExpoLauncherIcon, Icon2x2Layout_Expo)
@@ -92,14 +92,14 @@
   wm->SetCurrentViewport(nux::Point(0, 1));
   wm->terminate_expo.emit();
   EXPECT_EQ(icon.icon_name, "workspace-switcher-left-bottom");
-  
+
   wm->SetCurrentViewport(nux::Point(1, 1));
   wm->terminate_expo.emit();
   EXPECT_EQ(icon.icon_name, "workspace-switcher-right-bottom");
 
   wm->SetCurrentViewport(nux::Point(0, 0));
   wm->terminate_expo.emit();
-  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left"); 
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
 }
 
 TEST_F(TestExpoLauncherIcon, IconNot2x2Layout)
@@ -116,4 +116,13 @@
   EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
 }
 
+TEST_F(TestExpoLauncherIcon, AboutToRemoveDisablesViewport)
+{
+  wm->SetViewportSize(2, 2);
+
+  icon.AboutToRemove();
+  EXPECT_EQ(wm->GetViewportHSize(), 1);
+  EXPECT_EQ(wm->GetViewportVSize(), 1);
+}
+
 }

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2013-02-04 23:09:24 +0000
+++ unity-shared/PluginAdapter.cpp	2013-02-11 17:32:24 +0000
@@ -1113,6 +1113,26 @@
   return nux::Point(vp.x(), vp.y());
 }
 
+void PluginAdapter::SetViewportSize(int horizontal, int vertical)
+{
+  if (horizontal < 1 || vertical < 1)
+  {
+    LOG_ERROR(logger) << "Impossible to set viewport to invalid values "
+                      << horizontal << "x" << vertical;
+    return;
+  }
+
+  CompOption::Value hsize;
+  hsize.set<int>(horizontal);
+  m_Screen->setOptionForPlugin("core", "hsize", hsize);
+
+  CompOption::Value vsize(vertical);
+  vsize.set<int>(vertical);
+  m_Screen->setOptionForPlugin("core", "vsize", vsize);
+
+  LOG_INFO(logger) << "Setting viewport size to " << hsize.i() << "x" << vsize.i();
+}
+
 int PluginAdapter::GetViewportHSize() const
 {
   return m_Screen->vpSize().width();

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2013-02-04 23:09:24 +0000
+++ unity-shared/PluginAdapter.h	2013-02-11 17:32:24 +0000
@@ -180,6 +180,7 @@
   int WorkspaceCount() const;
 
   nux::Point GetCurrentViewport() const override;
+  void SetViewportSize(int horizontal, int vertical) override;
   int GetViewportHSize() const override;
   int GetViewportVSize() const override;
 

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-02-05 21:12:51 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-02-11 17:32:24 +0000
@@ -492,8 +492,11 @@
 {
 }
 
-void StandaloneWindowManager::SetViewportSize(unsigned horizontal, unsigned vertical)
+void StandaloneWindowManager::SetViewportSize(int horizontal, int vertical)
 {
+  if (horizontal < 1 || vertical < 1)
+    return;
+
   nux::Size new_size(horizontal, vertical);
 
   if (viewport_size_ == new_size)

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-02-04 23:15:07 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-02-11 17:32:24 +0000
@@ -136,6 +136,7 @@
   virtual int WorkspaceCount() const;
 
   nux::Point GetCurrentViewport() const override;
+  void SetViewportSize(int horizontal, int vertical);
   int GetViewportHSize() const override;
   int GetViewportVSize() const override;
 
@@ -152,7 +153,6 @@
   void SetScaleActiveForGroup(bool scale_active_for_group);
   void SetCurrentDesktop(unsigned desktop_id);
 
-  void SetViewportSize(unsigned horizontal, unsigned vertical);
   void SetCurrentViewport(nux::Point const& vp);
   void SetWorkareaGeometry(nux::Geometry const& geo);
 

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2013-02-04 23:09:24 +0000
+++ unity-shared/WindowManager.h	2013-02-11 17:32:24 +0000
@@ -145,6 +145,7 @@
   virtual int WorkspaceCount() const = 0;
 
   virtual nux::Point GetCurrentViewport() const = 0;
+  virtual void SetViewportSize(int horizontal, int vertical) = 0;
   virtual int GetViewportHSize() const = 0;
   virtual int GetViewportVSize() const = 0;