Merge lp:~3v1n0/unity/refresh-panel+launcher-on-screen-unlock into lp:unity

[Marco Trevisan (Treviño)]

Make Panel and Launcher be aware of the ScreenSaver unlocking.

Fixed the bug #893647 using the new utility ScreenSaverHandler class by Sam.

[lp:~3v1n0/unity/refresh-panel+launcher-on-screen-unlock]

1787. By Marco Trevisan (Treviño) on 2011-12-20

Merging with new Sam's changes.

[Sam Spilsbury (smspillaz)]

We discussed doing this on general mouse grab / ungrab with fullscreen windows but apparantly the screensaver is doing something else as well, so this is an adequate solution in the meantime.

review: Approve

[Alex Launi (alexlauni)]

I'm guessing this is only relevant when the launcher is in autohide mode? Could you please update the tests so that's clear?

It should also be very easy to automate these tests.

review: Needs Fixing (test review)

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

For the launcher is relevant only on that case, for the menus is always relevant.

By the way. Yes testing is not hard, I only wait the parent branch to be merged, or I'll just move to the ungrab events (but since they are emitted more frequently, that would cause a lot of unneeded redraws).

[Sam Spilsbury (smspillaz)]

Rejecting now that we have code in trunk that does the same on UPower events.

review: Disapprove

[Michal Hruby (mhr3)]

I actually think this patch could have been better approach than UPower - although you don't really get "corruption", but if you switch to a guest account and back unity is often transparent, or you see unity as it was in the guest account until it's forced to redraw.

Still, the switches and handled also by lightdm these days, so we'd need to check its signals as well.

Unmerged revisions

1787. By Marco Trevisan (Treviño) on 2011-12-20

Merging with new Sam's changes.

1786. By Marco Trevisan (Treviño) on 2011-12-16

manual-tests: Added manual tests for ScreenSaver interaction.

1785. By Marco Trevisan (Treviño) on 2011-12-16

Launcher: use ScreenSaverHandler to hide (if needed) the launcher on screensaver end

Properly fixes bug #893647

1784. By Marco Trevisan (Treviño) on 2011-12-16

ScreenSaverHandler: add header guard, and extend sigc::trackable

1783. By Marco Trevisan (Treviño) on 2011-12-15

PanelMenuView: use ScreenSaverHandler to hide/show menus when screensaver is closed

When the ScreenSaver/LockScreen is closed, we need to check again the current
mouse position to check if showing the menus or not.

Partly Fixes bug #893647

1782. By Sam Spilsbury on 2011-12-15

  Added a small ScreenSaverHandler class to monitor changes in screensaver
  state. Note that at the moment it doesn't work because gnome-screensaver
  doesn't emit the ActiveChanged signal until it gets the grab, and the whole
  purpose of this is to watch for ActiveChanged in order to release the grabs.

  Tests included show that the detection code works.

=== added file 'manual-tests/ScreenSaverHandler.txt'
--- manual-tests/ScreenSaverHandler.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/ScreenSaverHandler.txt	2011-12-20 01:44:25 +0000
@@ -0,0 +1,34 @@
+Launcher Hide after Screen Saver / Screen Lock
+----------------------------------------------
+This test shows the interaction between the screensaver and the Launcher.
+
+#. Start on a clean screen
+#. Move the mouse pointer over a launcher icon
+#. Make the screen lock (use Ctrl+Alt+L or use the proper dbus call like
+     gdbus call -e -d org.gnome.ScreenSaver -o / -m org.gnome.ScreenSaver.Lock )
+#. When the screen locking is active, move the mouse cursor on the center of the
+   screen
+
+Outcome
+  When unlocking the screen, the launcher should hide as the mouse is not any
+  more over it.
+  Performing the same action, leaving the mouse pointer over the launcher area
+  should make the menus to show on unlock.
+
+
+Panel Menus Hide after Screen Saver / Screen Lock
+-------------------------------------------------
+This test shows the interaction between the GlobalMenu and the Launcher.
+
+#. Start on a clean screen
+#. Start an application that has menus and focus it
+#. Move the mouse pointer over the top panel to make the menus show
+#. Make the screen lock (use Ctrl+Alt+L or use the proper dbus call like
+     gdbus call -e -d org.gnome.ScreenSaver -o / -m org.gnome.ScreenSaver.Lock )
+#. When the screen locking is active, move the mouse cursor on the center of the
+   screen
+
+Outcome
+  When unlocking the screen, the menus should be hidden.
+  Performing the same action, leaving the mouse pointer over the global menu
+  area should make the menus to show on unlock.

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-12-14 16:18:41 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-12-20 01:44:25 +0000
@@ -199,6 +199,9 @@
 
   display.changed.connect(sigc::mem_fun(this, &Launcher::OnDisplayChanged));
 
+  ss_handler_ = ScreenSaverHandler::Default();
+  ss_handler_->state_change.connect(sigc::mem_fun(this, &Launcher::OnScreenSaverStateChanged));
+
   _current_icon       = NULL;
   _current_icon_index = -1;
   _last_icon_index    = -1;
@@ -3202,6 +3205,24 @@
     return NULL;
 }
 
+void
+Launcher::OnScreenSaverStateChanged(bool active)
+{
+  if (!active)
+  {
+    nux::Point pt = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+    SetMousePosition(pt.x, pt.y);
+
+    if (!GetAbsoluteGeometry().IsInside(pt))
+    {
+      SetStateMouseOverLauncher(false);
+      SetHover(false);
+      EnsureAnimation();
+    }
+  }
+}
+
+
 /* dbus handlers */
 
 void

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-12-08 01:23:11 +0000
+++ plugins/unityshell/src/Launcher.h	2011-12-20 01:44:25 +0000
@@ -37,6 +37,7 @@
 #include "LauncherDragWindow.h"
 #include "LauncherHideMachine.h"
 #include "LauncherHoverMachine.h"
+#include "ScreenSaverHandler.h"
 
 #define ANIM_DURATION_SHORT_SHORT 100
 #define ANIM_DURATION_SHORT 125
@@ -376,6 +377,8 @@
 
   void OnDisplayChanged(Display* display);
   void OnDNDDataCollected(const std::list<char*>& mimes);
+
+  void OnScreenSaverStateChanged(bool active);
   
   void DndReset();
   void DndHoveredIconReset();
@@ -501,6 +504,8 @@
 
   ui::AbstractIconRenderer::Ptr icon_renderer;
   BackgroundEffectHelper bg_effect_helper_;
+
+  ScreenSaverHandler::Ptr ss_handler_;
 };
 
 }

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-12-14 20:04:23 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-12-20 01:44:25 +0000
@@ -173,6 +173,9 @@
   SetOpacity(0.0f);
   _window_buttons->SetOpacity(0.0f);
 
+  _ss_handler = ScreenSaverHandler::Default();
+  _ss_handler->state_change.connect(sigc::mem_fun(this, &PanelMenuView::OnScreenSaverStateChanged));
+
   Refresh();
   FullRedraw();
 }
@@ -347,6 +350,18 @@
   NeedRedraw();
 }
 
+void
+PanelMenuView::OnScreenSaverStateChanged(bool active)
+{
+  if (!active)
+  {
+    auto mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
+    _is_inside = GetAbsoluteGeometry().IsPointInside(mouse.x, mouse.y);
+    _is_grabbed = false;
+    FullRedraw();
+  }
+}
+
 bool
 PanelMenuView::DrawMenus()
 {

=== modified file 'plugins/unityshell/src/PanelMenuView.h'
--- plugins/unityshell/src/PanelMenuView.h	2011-12-14 20:04:23 +0000
+++ plugins/unityshell/src/PanelMenuView.h	2011-12-20 01:44:25 +0000
@@ -29,6 +29,7 @@
 #include "WindowButtons.h"
 #include "PanelTitlebarGrabAreaView.h"
 #include "PluginAdapter.h"
+#include "ScreenSaverHandler.h"
 #include "Animator.h"
 
 #include <UnityCore/GLibWrapper.h>
@@ -138,6 +139,8 @@
   void OnFadeInChanged(double);
   void OnFadeOutChanged(double);
 
+  void OnScreenSaverStateChanged(bool);
+
 private:
   glib::Object<BamfMatcher> _matcher;
 
@@ -194,6 +197,8 @@
 
   Animator* _fade_in_animator;
   Animator* _fade_out_animator;
+
+  ScreenSaverHandler::Ptr _ss_handler;
 };
 
 }