Merge lp:~3v1n0/unity/indicator-prelight-fix into lp:unity

[Marco Trevisan (Treviño)]

PanelIndicatorEntryView: Activate menus on click, by drawing them as active

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4028
http://jenkins.qa.ubuntu.com/job/unity-ci/1341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/117
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/116/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1341/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2015-10-05 16:52:24 +0000
+++ panel/PanelIndicatorEntryView.cpp	2015-11-05 15:59:06 +0000
@@ -98,29 +98,6 @@
 
 void PanelIndicatorEntryView::ShowMenu(int button)
 {
-  WindowManager& wm = WindowManager::Default();
-
-  if (wm.IsExpoActive())
-  {
-    // Delay the activation until expo is closed
-    auto conn = std::make_shared<connection::Wrapper>();
-    *conn = wm.terminate_expo.connect([this, conn, button] {
-      ShowMenu(button);
-      (*conn)->disconnect();
-    });
-
-    wm.TerminateExpo();
-    return;
-  }
-
-  if (wm.IsScaleActive())
-  {
-    if (type_ == MENU)
-      return;
-
-    wm.TerminateScale();
-  }
-
   auto const& abs_geo = GetAbsoluteGeometry();
   proxy_->ShowMenu(abs_geo.x, abs_geo.y + abs_geo.height, button);
 }
@@ -142,8 +119,30 @@
     }
     else
     {
-      ShowMenu(button);
-      Refresh();
+      WindowManager& wm = WindowManager::Default();
+
+      if (wm.IsExpoActive())
+      {
+        // Delay the activation until expo is closed
+        auto conn = std::make_shared<connection::Wrapper>();
+        *conn = wm.terminate_expo.connect([this, conn, button] {
+          Activate(button);
+          (*conn)->disconnect();
+        });
+
+        wm.TerminateExpo();
+        return;
+      }
+
+      if (wm.IsScaleActive())
+      {
+        if (type_ == MENU)
+          return;
+
+        wm.TerminateScale();
+      }
+
+      Activate(button);
     }
   }
 }