Merge lp:~3v1n0/unity/laucher-edge-reveal-revisited into lp:unity

[Marco Trevisan (Treviño)]

When using the edge revealing, the launcher is too slow to show and it often shows when not needed.

So, I've basically added a compiz option which allows to set the timeout to wait before showing the unity launcher, currently set to 150ms.
Then, I've introduced some more filters which should avoid unneeded revelations: basically after that the reveal timeout has been reached we also check if we didn't move "too much" the mouse along the Y axis; then if we didn't move, the launcher is shown, otherwise we retry to show the launcher until the mouse pointer is touching the left edge.

Another thing that I didn't implemented yet, but that could be considered, comes from the bug #801320: actually we only allow the launcher to show if the mouse pointer "hits" on the left screen edge, maybe we should allow also to show it if we stay on the pointerX "1px" for a longer time; maybe for something like 4*_edge_timeout, and we didn't move after this timeout (in the Y axis). Just let me know if this is something that I should add to this branch.

[Jason Smith (jassmith)]

+1 looks good

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-07-28 10:43:23 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-07-28 18:11:21 +0000
@@ -139,6 +139,8 @@
 
   debugger = new DebugDBusInterface(this);
 
+  _edge_timeout = optionGetLauncherRevealEdgeTimeout ();
+
   optionSetLauncherHideModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetBacklightModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetLaunchAnimationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -160,6 +162,7 @@
   optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
   optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
   optionSetLauncherRevealEdgeInitiate(boost::bind(&UnityScreen::launcherRevealEdgeInitiate, this, _1, _2, _3));
+  optionSetLauncherRevealEdgeTimeoutNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
   optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
   for (unsigned int i = 0; i < G_N_ELEMENTS(_ubus_handles); i++)
@@ -524,7 +527,33 @@
   UnityScreen* self = reinterpret_cast<UnityScreen*>(data);
 
   if (pointerX == 0)
-    self->launcher->EdgeRevealTriggered();
+  {
+    if (abs(pointerY-self->_edge_pointerY) <= 5)
+    {
+      self->launcher->EdgeRevealTriggered();
+    }
+    else
+    {
+      /* We are still in the edge, but moving in Y, maybe we need another chance */
+
+      if (abs(pointerY-self->_edge_pointerY) > 20)
+      {
+        /* We're quite far from the first hit spot, let's wait again */
+        self->_edge_pointerY = pointerY;
+        return true;
+      }
+      else
+      {
+        /* We're quite near to the first hit spot, so we can reduce our timeout */
+        self->_edge_pointerY = pointerY;
+        g_source_remove(self->_edge_trigger_handle);
+        self->_edge_trigger_handle = g_timeout_add(self->_edge_timeout/2,
+                                                   &UnityScreen::OnEdgeTriggerTimeout,
+                                                   self);
+        return false;
+      }
+    }
+  }
 
   self->_edge_trigger_handle = 0;
   return false;
@@ -540,7 +569,14 @@
   if (_edge_trigger_handle)
     g_source_remove(_edge_trigger_handle);
 
-  _edge_trigger_handle = g_timeout_add(500, &UnityScreen::OnEdgeTriggerTimeout, this);
+  if (pointerX == 0)
+  {
+    _edge_pointerY = pointerY;
+    _edge_trigger_handle = g_timeout_add(_edge_timeout,
+                                         &UnityScreen::OnEdgeTriggerTimeout,
+                                         this);
+  }
+
   return false;
 }
 
@@ -982,6 +1018,9 @@
     case UnityshellOptions::DevicesOption:
       unity::DevicesSettings::GetDefault().SetDevicesOption((unity::DevicesSettings::DevicesOption) optionGetDevicesOption());
       break;
+    case UnityshellOptions::LauncherRevealEdgeTimeout:
+      _edge_timeout = optionGetLauncherRevealEdgeTimeout();
+      break;
     default:
       break;
   }

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-07-28 11:02:56 +0000
+++ plugins/unityshell/src/unityshell.h	2011-07-28 18:11:21 +0000
@@ -197,7 +197,9 @@
   DebugDBusInterface*     debugger;
   bool                   needsRelayout;
   guint32                relayoutSourceId;
+  guint                  _edge_timeout;
   guint                  _edge_trigger_handle;
+  gint                   _edge_pointerY;
   guint                  _ubus_handles[3];
 
   /* keyboard-nav mode */

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2011-07-26 12:33:23 +0000
+++ plugins/unityshell/unityshell.xml.in	2011-07-28 18:11:21 +0000
@@ -46,7 +46,14 @@
                         <edge name="Left"/>
                     </default>
                  </option>
-	              <option name="launcher_hide_mode" type="int">
+                 <option name="launcher_reveal_edge_timeout" type="int">
+                    <_short>Edge Reveal Timeout</_short>
+                    <_long>How long (in ms) wait before revealing the launcher when the mouse pointer is touching the edge.</_long>
+                    <min>1</min>
+                    <max>1000</max>
+                    <default>150</default>
+                 </option>
+	         <option name="launcher_hide_mode" type="int">
                     <_short>Hide Launcher</_short>
                     <_long>Make the launcher hide automatically after some time of inactivity: always or just when the focussed window is not over the launcher</_long>
                     <min>0</min>