Merge lp:~thumper/unity/fix-launcher-multimonitor-resaturate into lp:unity

[Tim Penhey]

Make the panel more aware of open overlays, and make sure that all launchers resaturate the icons when overlays (the dash or hud) are closed.

== The problem ==

1. With multiple monitors, closing the hud or dash on one monitor would cause the launcher on one monitor to stay with desaturated icons.

2. The panel would go solid if switching from the hud to the dash (or vice versa) without closing the open overlay first.

== The solution ==

1. A little brutal, but request a redraw when an overlay closes.
2. Remember which overlay last opened, and only go solid if the close matches the last open.

== Tests ==

Manual I'm afraid.

UNBLOCK

[Thomi Richards (thomir-deactivatedaccount)]

Pity about the manual tests, but looks good otherwise.

review: Approve

[Tim Penhey (thumper)]

Yeah, I'd like to expose the state of the panel in autopilot.

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-03-21 18:19:34 +0000
+++ manual-tests/Launcher.txt	2012-03-23 02:37:26 +0000
@@ -188,3 +188,19 @@
 Outcome:
   * Only the primary monitor should show a launcher. Changing the primary monitor
     from gnome-control-center -> Monitor should update the launcher position.
+
+
+Panel appearance with overlays
+------------------------------
+Setup:
+  Have a secondary monitor plugged in and working.
+  Have the launchers on each monitor
+  Make sure the launcher setting is to never hide.
+
+Actions:
+#. Press <super> to bring up the dash
+#. Press <super> to close the dash
+
+Expected Result:
+  The launchers on each monitor have saturated icons (normal looking, not the
+  desaturated look that there is while the dash is open).
 
=== modified file 'manual-tests/Panel.txt'
--- manual-tests/Panel.txt	2012-03-14 06:24:18 +0000
+++ manual-tests/Panel.txt	2012-03-23 02:37:26 +0000
@@ -60,3 +60,17 @@
   of the panel should change inline with changes in alt-tab focus.
   Also the menus shouldn't ever show. Even if the mouse has been left over
   the panel when starting the Alt+Tab.
+
+
+Panel appearance with overlays
+------------------------------
+Actions:
+#. Press <super> to bring up the dash
+
+Expected Result:
+  The panel should be translucent matching the dash background
+
+#. Press <alt> to bring up the hud without closing the dash
+
+Expected Result:
+  The panel should stay translucent
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-21 14:44:41 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-23 02:37:26 +0000
@@ -1321,9 +1321,14 @@
   gint32 overlay_monitor = 0;
   g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
                 &overlay_identity, &can_maximise, &overlay_monitor);
-
   std::string identity = overlay_identity.Str();
-  if (overlay_monitor == monitor)
+
+  LOG_DEBUG(logger) << "Overlay shown: " << identity
+                    << ", " << (can_maximise ? "can maximise" : "can't maximise")
+                    << ", on monitor " << overlay_monitor
+                    << " (for monitor " << monitor() << ")";
+
+  if (overlay_monitor == monitor())
   {
     if (identity == "dash")
     {
@@ -1337,8 +1342,10 @@
     }
 
     bg_effect_helper_.enabled = true;
+    LOG_DEBUG(logger) << "Desaturate on monitor " << monitor();
     DesaturateIcons();
   }
+  EnsureAnimation();
 }
 
 void Launcher::OnOverlayHidden(GVariant* data)
@@ -1351,7 +1358,13 @@
                 &overlay_identity, &can_maximise, &overlay_monitor);
 
   std::string identity = overlay_identity.Str();
-  if (overlay_monitor == monitor)
+
+  LOG_DEBUG(logger) << "Overlay hidden: " << identity
+                    << ", " << (can_maximise ? "can maximise" : "can't maximise")
+                    << ", on monitor " << overlay_monitor
+                    << " (for monitor" << monitor() << ")";
+
+  if (overlay_monitor == monitor())
   {
     if (identity == "dash")
     {
@@ -1365,12 +1378,14 @@
     }
 
     // If they are both now shut, then disable the effect helper and saturate the icons.
-    if (!_dash_is_open and !_hud_is_open)
+    if (!IsOverlayOpen())
     {
       bg_effect_helper_.enabled = false;
+      LOG_DEBUG(logger) << "Saturate on monitor " << monitor();
       SaturateIcons();
     }
   }
+  EnsureAnimation();
 
   // as the leave event is no more received when the place is opened
   // FIXME: remove when we change the mouse grab strategy in nux
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2012-03-22 19:33:10 +0000
+++ plugins/unityshell/src/PanelView.cpp	2012-03-23 02:37:26 +0000
@@ -61,7 +61,7 @@
       _opacity_maximized_toggle(false),
       _is_primary(false),
       _monitor(0),
-      _dash_is_open(false)
+      _overlay_is_open(false)
 {
   _needs_geo_sync = false;
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelView::ForceUpdateBackground));
@@ -173,11 +173,22 @@
 
 void PanelView::OnDashHidden(GVariant* data, PanelView* self)
 {
-  if (self->_opacity >= 1.0f)
-    self->bg_effect_helper_.enabled = false;
-  self->_dash_is_open = false;
-  self->_indicators->DashHidden();
-  self->ForceUpdateBackground();
+  unity::glib::String overlay_identity;
+  gboolean can_maximise = FALSE;
+  gint32 overlay_monitor = 0;
+  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
+                &overlay_identity, &can_maximise, &overlay_monitor);
+
+  if (self->_monitor == overlay_monitor &&
+      overlay_identity.Str() == self->_active_overlay)
+  {
+    if (self->_opacity >= 1.0f)
+      self->bg_effect_helper_.enabled = false;
+    self->_overlay_is_open = false;
+    self->_active_overlay = "";
+    self->_indicators->DashHidden();
+    self->ForceUpdateBackground();
+  }
 }
 
 void PanelView::OnDashShown(GVariant* data, PanelView* self)
@@ -185,13 +196,14 @@
   unity::glib::String overlay_identity;
   gboolean can_maximise = FALSE;
   gint32 overlay_monitor = 0;
-  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING, 
+  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
                 &overlay_identity, &can_maximise, &overlay_monitor);
 
   if (self->_monitor == overlay_monitor)
   {
     self->bg_effect_helper_.enabled = true;
-    self->_dash_is_open = true;
+    self->_overlay_is_open = true;
+    self->_active_overlay = overlay_identity.Str();
     self->_indicators->DashShown();
     self->ForceUpdateBackground();
   }
@@ -227,12 +239,12 @@
 
   GfxContext.PushClippingRectangle(GetGeometry());
 
-  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
+  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, geo.width, geo.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
 
-    if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || _opacity != 1.0f))
+    if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || _opacity != 1.0f))
     {
       nux::TexCoordXForm texxform_blur_bg;
       texxform_blur_bg.flip_v_coord = true;
@@ -277,7 +289,7 @@
       GfxContext.PopClippingRectangle();
     }
 
-    if (_dash_is_open)
+    if (_overlay_is_open)
     {
       nux::GetPainter().RenderSinglePaintLayer(GfxContext, GetGeometry(), _bg_darken_layer_);
     }
@@ -285,7 +297,7 @@
 
 
 
-  if (_dash_is_open == false)
+  if (_overlay_is_open == false)
     nux::GetPainter().RenderSinglePaintLayer(GfxContext, GetGeometry(), _bg_layer);
 
   GfxContext.PopClippingRectangle();
@@ -308,7 +320,7 @@
   GfxContext.GetRenderStates().SetBlend(true);
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_dash_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
+  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry geo_absolute = GetAbsoluteGeometry ();
     nux::TexCoordXForm texxform_blur_bg;
@@ -352,17 +364,17 @@
 #endif
     bgs++;
 
-    if (_dash_is_open)
+    if (_overlay_is_open)
     {
       nux::GetPainter().PushLayer(GfxContext, GetGeometry(), _bg_darken_layer_);
       bgs++;
     }
   }
 
-  if (_dash_is_open == FALSE)
+  if (_overlay_is_open == FALSE)
     gPainter.PushLayer(GfxContext, GetGeometry(), _bg_layer);
 
-  if (_dash_is_open)
+  if (_overlay_is_open)
   {
     // apply the shine
     nux::TexCoordXForm texxform;
@@ -414,7 +426,7 @@
   
   guint32 maximized_win = _menu_view->GetMaximizedWindow();
 
-  if (_dash_is_open)
+  if (_overlay_is_open)
   {
     if (_bg_layer)
       delete _bg_layer;
@@ -658,7 +670,7 @@
 
   _opacity = opacity;
 
-  bg_effect_helper_.enabled = (_opacity < 1.0f || _dash_is_open);
+  bg_effect_helper_.enabled = (_opacity < 1.0f || _overlay_is_open);
 
   ForceUpdateBackground();
 }
 
=== modified file 'plugins/unityshell/src/PanelView.h'
--- plugins/unityshell/src/PanelView.h	2012-03-22 19:33:10 +0000
+++ plugins/unityshell/src/PanelView.h	2012-03-23 02:37:26 +0000
@@ -116,7 +116,8 @@
   bool        _is_primary;
   int         _monitor;
 
-  bool        _dash_is_open;
+  bool        _overlay_is_open;
+  std::string _active_overlay;
   guint       _handle_dash_hidden;
   guint       _handle_dash_shown;
   guint       _handle_bg_color_update;