Merge lp:~didrocks/unity/fix-705805 into lp:unity

[Didier Roche-Tolomelli]

This branch prerequisites ~didrocks/unity/fix-705948

don't wait for the autohide delay on launcher trigger (key press or dash) if we have already waited the launcher trigger time (LP: #705805)

[Mirco Müller (macslow)]

Looks good.

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-01-24 13:18:37 +0000
+++ src/Launcher.cpp	2011-01-24 13:18:37 +0000
@@ -971,26 +971,32 @@
 {
     _key_show_launcher = true;
     EnsureHiddenState ();
+    // trigger the timer now as we want to hide the launcher immediately
+    // if we release the key after 1s happened.
+    SetupAutohideTimer ();
 }
 
 void Launcher::EndKeyShowLauncher ()
 {
     _key_show_launcher = false;
-    SetupAutohideTimer ();
+    EnsureHiddenState ();
 }
 
 void Launcher::OnPlaceViewShown (GVariant *data, void *val)
 {
     Launcher *self = (Launcher*)val;
     self->_placeview_show_launcher = true;
+    // trigger the timer now as we want to hide the launcher immediately
+    // if we close the dash after 1s happened.
     self->EnsureHiddenState ();
+    self->SetupAutohideTimer ();
 }
 
 void Launcher::OnPlaceViewHidden (GVariant *data, void *val)
 {
     Launcher *self = (Launcher*)val;
     self->_placeview_show_launcher = false;
-    self->SetupAutohideTimer ();
+    self->EnsureHiddenState ();
 }
 
 void Launcher::SetHidden (bool hidden)
@@ -1010,8 +1016,8 @@
 {
     Launcher *self = (Launcher*) data;
 
-    self->EnsureHiddenState ();
     self->_autohide_handle = 0;
+    self->EnsureHiddenState ();
     return false;
 }
 
@@ -1024,6 +1030,7 @@
       !_placeview_show_launcher &&
        _launcher_action_state == ACTION_NONE &&
       !QuicklistManager::Default ()->Current() &&
+      !_autohide_handle &&
       _window_over_launcher) 
     SetHidden (true);
   else