Merge lp:~azzar1/unity/fix-838854 into lp:unity

[Andrea Azzarone]

Change expo launcher icon depending on which workspace is currently being utilised.

== Problem ==
Bug #838854: Workspaces, Launcher - The workspace Launcher icon should change depending on which workspace is currently being utilised

== Tests ==
Unit tests added.

Requires: https://code.launchpad.net/~andyrock/unity-asset-pool/ws-icons/+merge/137598

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, even if I'd prefer a dynamic icon with cairo... But this is fine for now.

review: Approve

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2012-11-26 16:09:53 +0000
+++ launcher/ExpoLauncherIcon.cpp	2012-12-03 16:12:21 +0000
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Marco Trevisan <[e-mail]>
+ *              Andrea Azzarone <[e-mail]>
  */
 
 #include "ExpoLauncherIcon.h"
@@ -32,10 +33,51 @@
   : SimpleLauncherIcon(IconType::EXPO)
 {
   tooltip_text = _("Workspace Switcher");
-  icon_name = "workspace-switcher";
+  icon_name = "workspace-switcher-top-left";
   SetQuirk(Quirk::VISIBLE, false);
   SetQuirk(Quirk::RUNNING, false);
   SetShortcut('s');
+
+  auto& wm = WindowManager::Default();
+  OnViewportLayoutChanged(wm.GetViewportHSize(), wm.GetViewportVSize());
+
+  wm.viewport_layout_changed.connect(sigc::mem_fun(this, &ExpoLauncherIcon::OnViewportLayoutChanged));
+}
+
+void ExpoLauncherIcon::OnViewportLayoutChanged(int hsize, int vsize)
+{
+  if (hsize != 2 || vsize != 2)
+  {
+    icon_name = "workspace-switcher-top-left";
+    screen_viewport_switch_ended_connection_.disconnect();
+    terminate_expo_connection_.disconnect();
+  }
+  else
+  {
+    UpdateIcon();
+
+    if (!terminate_expo_connection_)
+    {
+      auto& wm = WindowManager::Default();
+      auto cb = sigc::mem_fun(this, &ExpoLauncherIcon::UpdateIcon);
+      screen_viewport_switch_ended_connection_ = wm.screen_viewport_switch_ended.connect(cb);
+      terminate_expo_connection_ = wm.terminate_expo.connect(cb);
+    }
+  }
+}
+
+void ExpoLauncherIcon::UpdateIcon()
+{
+  auto const& vp = WindowManager::Default().GetCurrentViewport();
+
+  if (vp.x == 0 and vp.y == 0)
+    icon_name = "workspace-switcher-top-left";
+  else if (vp.x == 0)
+    icon_name = "workspace-switcher-left-bottom";
+  else if (vp.y == 0)
+    icon_name = "workspace-switcher-right-top";
+  else
+    icon_name = "workspace-switcher-right-bottom";
 }
 
 void ExpoLauncherIcon::ActivateLauncherIcon(ActionArg arg)
@@ -44,13 +86,9 @@
   WindowManager& wm = WindowManager::Default();
 
   if (!wm.IsExpoActive())
-  {
     wm.InitiateExpo();
-  }
   else
-  {
     wm.TerminateExpo();
-  }
 }
 
 void ExpoLauncherIcon::Stick(bool save)

=== modified file 'launcher/ExpoLauncherIcon.h'
--- launcher/ExpoLauncherIcon.h	2012-09-07 15:01:14 +0000
+++ launcher/ExpoLauncherIcon.h	2012-12-03 16:12:21 +0000
@@ -37,6 +37,13 @@
   void ActivateLauncherIcon(ActionArg arg);
   std::string GetName() const;
   std::string GetRemoteUri();
+
+private:
+  void OnViewportLayoutChanged(int hsize, int vsize);
+  void UpdateIcon();
+
+  sigc::connection screen_viewport_switch_ended_connection_;
+  sigc::connection terminate_expo_connection_;
 };
 
 }

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-11-28 22:05:07 +0000
+++ launcher/LauncherController.cpp	2012-12-03 16:12:21 +0000
@@ -145,6 +145,7 @@
 
   WindowManager& wm = WindowManager::Default();
   wm.window_focus_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnWindowFocusChanged));
+  wm.viewport_layout_changed.connect(sigc::group(sigc::mem_fun(this, &Controller::Impl::UpdateNumWorkspaces), sigc::_1 * sigc::_2));
 
   ubus.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV, [&](GVariant * args) {
     if (reactivate_keynav)

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-11-27 01:09:26 +0000
+++ launcher/LauncherIcon.cpp	2012-12-03 16:12:21 +0000
@@ -360,7 +360,7 @@
 
   // FIXME: we need to create some kind of -unity postfix to see if we are looking to the unity-icon-theme
   // for dedicated unity icons, then remove the postfix and degrade to other icon themes if not found
-  if (icon_name == "workspace-switcher" && IsMonoDefaultTheme())
+  if (icon_name.find("workspace-switcher") == 0)
     result = TextureFromSpecificGtkTheme(GetUnityTheme(), icon_name, size, update_glow_colors);
 
   if (!result)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-11-27 00:39:39 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-12-03 16:12:21 +0000
@@ -3071,7 +3071,10 @@
     if (strcmp(plugin, "core") == 0)
     {
       if (strcmp(name, "hsize") == 0 || strcmp(name, "vsize") == 0)
-        launcher_controller_->UpdateNumWorkspaces(screen->vpSize().width() * screen->vpSize().height());
+      {
+        WindowManager& wm = WindowManager::Default();
+        wm.viewport_layout_changed.emit(screen->vpSize().width(), screen->vpSize().height());
+      }
     }
   }
   return status;

=== modified file 'tests/test_expo_launcher_icon.cpp'
--- tests/test_expo_launcher_icon.cpp	2012-10-11 01:44:15 +0000
+++ tests/test_expo_launcher_icon.cpp	2012-12-03 16:12:21 +0000
@@ -15,34 +15,39 @@
  * <http://www.gnu.org/licenses/>
  *
  * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ *              Andrea Azzarone <[e-mail]>
  */
 
 #include <gmock/gmock.h>
 
 #include "launcher/ExpoLauncherIcon.h"
-#include "unity-shared/WindowManager.h"
+#include "unity-shared/StandaloneWindowManager.h"
 
 using namespace unity;
 using namespace unity::launcher;
 
 namespace
 {
+
 struct TestExpoLauncherIcon : testing::Test
 {
+  TestExpoLauncherIcon()
+    : wm(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
+  {}
+
   ExpoLauncherIcon icon;
+  StandaloneWindowManager* wm;
 };
 
 TEST_F(TestExpoLauncherIcon, ActivateToggleExpo)
 {
-  WindowManager& wm = WindowManager::Default();
-
-  ASSERT_FALSE(wm.IsExpoActive());
-
-  icon.Activate(ActionArg());
-  ASSERT_TRUE(wm.IsExpoActive());
-
-  icon.Activate(ActionArg());
-  EXPECT_FALSE(wm.IsExpoActive());
+  ASSERT_FALSE(wm->IsExpoActive());
+
+  icon.Activate(ActionArg());
+  ASSERT_TRUE(wm->IsExpoActive());
+
+  icon.Activate(ActionArg());
+  EXPECT_FALSE(wm->IsExpoActive());
 }
 
 TEST_F(TestExpoLauncherIcon, Position)
@@ -55,4 +60,60 @@
   EXPECT_EQ(icon.RemoteUri(), "unity://expo-icon");
 }
 
+TEST_F(TestExpoLauncherIcon, Icon2x2Layout)
+{
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
+
+  wm->SetCurrentViewport(nux::Point(1, 0));
+  wm->screen_viewport_switch_ended.emit();
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-right-top");
+
+  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"); 
+}
+
+TEST_F(TestExpoLauncherIcon, Icon2x2Layout_Expo)
+{
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
+
+  wm->SetCurrentViewport(nux::Point(1, 0));
+  wm->terminate_expo.emit();
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-right-top");
+
+  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"); 
+}
+
+TEST_F(TestExpoLauncherIcon, IconNot2x2Layout)
+{
+  wm->SetCurrentViewport(nux::Point(1, 0));
+  wm->screen_viewport_switch_ended.emit();
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-right-top");
+
+  wm->viewport_layout_changed.emit(5, 2);
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
+
+  wm->SetCurrentViewport(nux::Point(1, 1));
+  wm->screen_viewport_switch_ended.emit();
+  EXPECT_EQ(icon.icon_name, "workspace-switcher-top-left");
+}
+
 }

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2012-11-27 01:09:26 +0000
+++ unity-shared/PluginAdapter.cpp	2012-12-03 16:12:21 +0000
@@ -1084,6 +1084,22 @@
   return m_Screen->vpSize().width() * m_Screen->vpSize().height();
 }
 
+nux::Point PluginAdapter::GetCurrentViewport() const
+{
+  CompPoint const& vp = m_Screen->vp();
+  return nux::Point(vp.x(), vp.y());
+}
+
+int PluginAdapter::GetViewportHSize() const
+{
+  return m_Screen->vpSize().width();
+}
+
+int PluginAdapter::GetViewportVSize() const
+{
+  return m_Screen->vpSize().height();
+}
+
 void PluginAdapter::SetMwmWindowHints(Window xid, MotifWmHints* new_hints) const
 {
   Display* display = m_Screen->dpy();

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-11-12 17:27:48 +0000
+++ unity-shared/PluginAdapter.h	2012-12-03 16:12:21 +0000
@@ -177,6 +177,10 @@
 
   int WorkspaceCount() const;
 
+  nux::Point GetCurrentViewport() const override;
+  int GetViewportHSize() const override;
+  int GetViewportVSize() const override;
+
   void SetCoverageAreaBeforeAutomaximize(float area);
 
   bool SaveInputFocus();

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2012-11-27 01:19:45 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2012-12-03 16:12:21 +0000
@@ -438,6 +438,21 @@
   return 4;
 }
 
+nux::Point StandaloneWindowManager::GetCurrentViewport() const
+{
+  return current_vp_;
+}
+
+ int StandaloneWindowManager::GetViewportHSize() const
+{
+  return 2;
+}
+
+int StandaloneWindowManager::GetViewportVSize() const
+{
+  return 2;
+}
+
 bool StandaloneWindowManager::SaveInputFocus()
 {
   return false;
@@ -480,6 +495,10 @@
   return standalone_windows_;
 }
 
+void StandaloneWindowManager::SetCurrentViewport(nux::Point const& vp)
+{
+  current_vp_ = vp;
+}
 
 void StandaloneWindowManager::AddProperties(GVariantBuilder* builder)
 {

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2012-10-31 18:20:10 +0000
+++ unity-shared/StandaloneWindowManager.h	2012-12-03 16:12:21 +0000
@@ -129,6 +129,10 @@
 
   virtual int WorkspaceCount() const;
 
+  nux::Point GetCurrentViewport() const override;
+  int GetViewportHSize() const override;
+  int GetViewportVSize() const override;
+
   virtual bool SaveInputFocus();
   virtual bool RestoreInputFocus();
 
@@ -142,6 +146,8 @@
   void AddStandaloneWindow(StandaloneWindow::Ptr const& window);
   std::map<Window, StandaloneWindow::Ptr> GetStandaloneWindows() const;
 
+  void SetCurrentViewport(nux::Point const& vp);
+
 protected:
   virtual void AddProperties(GVariantBuilder* builder);
 
@@ -152,6 +158,7 @@
   bool scale_active_for_group_;
   unsigned current_desktop_;
   std::map<Window, StandaloneWindow::Ptr> standalone_windows_;
+  nux::Point current_vp_;
 };
 
 }

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2012-11-15 18:44:55 +0000
+++ unity-shared/WindowManager.h	2012-12-03 16:12:21 +0000
@@ -141,6 +141,10 @@
 
   virtual int WorkspaceCount() const = 0;
 
+  virtual nux::Point GetCurrentViewport() const = 0;
+  virtual int GetViewportHSize() const = 0;
+  virtual int GetViewportVSize() const = 0;
+
   virtual bool SaveInputFocus() = 0;
   virtual bool RestoreInputFocus() = 0;
 
@@ -173,6 +177,7 @@
   sigc::signal<void> screen_ungrabbed;
   sigc::signal<void> screen_viewport_switch_started;
   sigc::signal<void> screen_viewport_switch_ended;
+  sigc::signal<void, int, int> viewport_layout_changed;
 
 protected:
   std::string GetName() const;