* Remove LAST_ACTION quirk in the hide machine as that is no longer used.

(bzr r2540.8.2)

2 files changed, 2 insertions, 16 deletions

diff --git a/launcher/LauncherHideMachine.cpp b/launcher/LauncherHideMachine.cpp
index 8127b1a36..c4c2ffbe7 100644
--- a/launcher/LauncherHideMachine.cpp
+++ b/launcher/LauncherHideMachine.cpp
@@ -29,7 +29,7 @@ namespace launcher
 namespace
 {
 nux::logging::Logger logger("unity.launcher");
-const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 750;
+const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;
 }
 
 LauncherHideMachine::LauncherHideMachine()
@@ -94,7 +94,6 @@ void LauncherHideMachine::SetShouldHide(bool value, bool skip_delay)
 VERTICAL_SLIDE_ACTIVE = 1 << 12, 4k #VISIBLE_REQUIRED
 KEY_NAV_ACTIVE = 1 << 13, 8k #VISIBLE_REQUIRED
 PLACES_VISIBLE = 1 << 14, 16k #VISIBLE_REQUIRED
- LAST_ACTION_ACTIVATE = 1 << 15, 32k
 SCALE_ACTIVE = 1 << 16, 64k #VISIBLE_REQUIRED
 EXPO_ACTIVE = 1 << 17, 128k #VISIBLE_REQUIRED
 MT_DRAG_OUT = 1 << 18, 256k #VISIBLE_REQUIRED
@@ -138,13 +137,6 @@ void LauncherHideMachine::EnsureHideState(bool skip_delay)
 if (_mode == AUTOHIDE)
 hide_for_window = true;
 
- // if we activated AND we would hide because of a window, go ahead and do it
- if (!_should_hide && GetQuirk(LAST_ACTION_ACTIVATE) && hide_for_window)
- {
- should_hide = true;
- break;
- }
-
 // Is there anything holding us open?
 HideQuirk _should_show_quirk;
 if (GetQuirk(LAUNCHER_HIDDEN))
@@ -201,12 +193,7 @@ void LauncherHideMachine::SetQuirk(LauncherHideMachine::HideQuirk quirk, bool ac
 else
 _quirks = (HideQuirk)(_quirks & ~quirk);
 
- // no skipping when last action was activate on general case
- bool skip = quirk & SKIP_DELAY_QUIRK && !GetQuirk(LAST_ACTION_ACTIVATE);
-
- // but skip on last action if we were out of the launcher/bfb
- if (GetQuirk(LAST_ACTION_ACTIVATE) && !active && (quirk & (MOUSE_OVER_LAUNCHER)))
- skip = true;
+ bool skip = quirk & SKIP_DELAY_QUIRK;
 
 EnsureHideState(skip);
 }
diff --git a/launcher/LauncherHideMachine.h b/launcher/LauncherHideMachine.h
index a60c173c7..185f92259 100644
--- a/launcher/LauncherHideMachine.h
+++ b/launcher/LauncherHideMachine.h
@@ -57,7 +57,6 @@ public:
 VERTICAL_SLIDE_ACTIVE = 1 << 12,
 KEY_NAV_ACTIVE = 1 << 13,
 PLACES_VISIBLE = 1 << 14,
- LAST_ACTION_ACTIVATE = 1 << 15,
 SCALE_ACTIVE = 1 << 16,
 EXPO_ACTIVE = 1 << 17,
 MT_DRAG_OUT = 1 << 18,