Merge lp:~townsend/unity/fix-lp1255241 into lp:unity

[Christopher Townsend]

Use IsVisibleOnMonitor() instead of IsVisible() for checking to close the Hud when clicking the Hud icon. This is due to the icon's quirk only being set for the current monitor.

= Issue =
Hud AP test failure due to clicking the Hud icon would not close the Hud. I confirmed this both through the AP test and manually.

Some fairly recent changes went into Unity that allowed quirks to be set on icons per monitor. The method to handle closing the Hud by clicking on the Hud icon was not updated and looked to see if all possible monitors had the quirk set instead of the monitor that had the Hud overlay open.

= Fix =
Use IsVisibleOnMonitor() instead of IsVisible() and add a new overlay_monitor_ member to keep track of which monitor the Hud overlay is open on.

= Test =
AP test is already included.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3603
http://jenkins.qa.ubuntu.com/job/unity-ci/516/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/50

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

review: Approve (continuous-integration)

[Eleni Maria Stea (hikiko)]

Looks good! +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3604
http://jenkins.qa.ubuntu.com/job/unity-ci/517/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/51

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/401/
Executed test runs:
    None: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3486/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/31/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2013-11-14 00:17:19 +0000
+++ launcher/HudLauncherIcon.cpp	2013-11-27 20:28:36 +0000
@@ -35,6 +35,7 @@
 HudLauncherIcon::HudLauncherIcon(LauncherHideMode hide_mode)
  : SingleMonitorLauncherIcon(IconType::HUD)
  , launcher_hide_mode_(hide_mode)
+ , overlay_monitor_(0)
 {
   tooltip_text = _("HUD");
   tooltip_enabled = false;
@@ -84,17 +85,16 @@
 {
   unity::glib::String overlay_identity;
   gboolean can_maximise = FALSE;
-  gint32 overlay_monitor = 0;
   int width, height;
   g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
-                &overlay_identity, &can_maximise, &overlay_monitor, &width, &height);
+                &overlay_identity, &can_maximise, &overlay_monitor_, &width, &height);
 
   // If the hud is open, we show the HUD button if we have a locked launcher
   if (overlay_identity.Str() == "hud" &&
       launcher_hide_mode_ == LAUNCHER_HIDE_NEVER)
   {
-    SetMonitor(visible ? overlay_monitor : -1);
-    SkipQuirkAnimation(Quirk::VISIBLE, overlay_monitor);
+    SetMonitor(visible ? overlay_monitor_ : -1);
+    SkipQuirkAnimation(Quirk::VISIBLE, overlay_monitor_);
   }
 }
 
@@ -110,7 +110,7 @@
 
 void HudLauncherIcon::ActivateLauncherIcon(ActionArg arg)
 {
-  if (IsVisible())
+  if (IsVisibleOnMonitor(overlay_monitor_))
   {
     ubus_manager_.SendMessage(UBUS_HUD_CLOSE_REQUEST);
   }

=== modified file 'launcher/HudLauncherIcon.h'
--- launcher/HudLauncherIcon.h	2012-11-06 18:19:09 +0000
+++ launcher/HudLauncherIcon.h	2013-11-27 20:28:36 +0000
@@ -52,6 +52,7 @@
   nux::Color background_color_;
   LauncherHideMode launcher_hide_mode_;
   UBusManager ubus_manager_;
+  gint32 overlay_monitor_; 
 };
 
 }