From 6e4c89b3101259275694eb3112d05ab005aec117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20D=C3=A9murget?= <stephane.demurget@free.fr>
Date: Sun, 4 Nov 2012 18:30:44 +0100
Subject: [PATCH] main: hide the overview on key release

Entering the overview with the overlay key is done on key release but
exiting the overview on key press, which is inconsistent.

This change makes the overview hidden also on key release.

https://bugzilla.gnome.org/show_bug.cgi?id=683024
---
 js/ui/main.js | 88 +++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/js/ui/main.js b/js/ui/main.js
index fcffbf7cc..638a85777 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -473,7 +473,7 @@ function getWindowActorsForWorkspace(workspaceIndex) {
 function _globalKeyPressHandler(actor, event) {
     if (modalCount == 0)
         return false;
-    if (event.type() != Clutter.EventType.KEY_PRESS)
+    if (event.type() != Clutter.EventType.KEY_PRESS && event.type() != Clutter.EventType.KEY_RELEASE)
         return false;
 
     if (!sessionMode.allowKeybindingsWhenModal) {
@@ -489,51 +489,57 @@ function _globalKeyPressHandler(actor, event) {
     // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
     let action = global.display.get_keybinding_action(keyCode, modifierState);
 
-    if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
-        ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
-                                modifierState);
-        return true;
-    }
-
-    switch (action) {
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing; we also disable them in the main view.
-        //
-        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
-        //     wm.actionMoveWorkspaceLeft();
-        //     return true;
-        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-        //  if (!sessionMode.hasWorkspaces)
-        //      return false;
-        //
-        //     wm.actionMoveWorkspaceRight();
-        //     return true;
-        case Meta.KeyBindingAction.WORKSPACE_UP:
-            if (!sessionMode.hasWorkspaces)
-                return false;
-
-            wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+    if (event.type() == Clutter.EventType.KEY_PRESS) {
+        if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
+            ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
+                                    modifierState);
             return true;
-        case Meta.KeyBindingAction.WORKSPACE_DOWN:
-            if (!sessionMode.hasWorkspaces)
-                return false;
+        }
 
-            wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
-            return true;
-        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
-        case Meta.KeyBindingAction.COMMAND_2:
-            if (!sessionMode.hasRunDialog)
-                return false;
+        switch (action) {
+            // left/right would effectively act as synonyms for up/down if we enabled them;
+            // but that could be considered confusing; we also disable them in the main view.
+            //
+            // case Meta.KeyBindingAction.WORKSPACE_LEFT:
+            //  if (!sessionMode.hasWorkspaces)
+            //      return false;
+            //
+            //     wm.actionMoveWorkspaceLeft();
+            //     return true;
+            // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+            //  if (!sessionMode.hasWorkspaces)
+            //      return false;
+            //
+            //     wm.actionMoveWorkspaceRight();
+            //     return true;
+            case Meta.KeyBindingAction.WORKSPACE_UP:
+                if (!sessionMode.hasWorkspaces)
+                    return false;
 
-            openRunDialog();
-            return true;
-        case Meta.KeyBindingAction.PANEL_MAIN_MENU:
-        case Meta.KeyBindingAction.OVERLAY_KEY:
+                wm.actionMoveWorkspace(Meta.MotionDirection.UP);
+                return true;
+            case Meta.KeyBindingAction.WORKSPACE_DOWN:
+                if (!sessionMode.hasWorkspaces)
+                    return false;
+
+                wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
+                return true;
+            case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+            case Meta.KeyBindingAction.COMMAND_2:
+                if (!sessionMode.hasRunDialog)
+                    return false;
+
+                openRunDialog();
+                return true;
+            case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+                overview.hide();
+                return true;
+        }
+    } else if (event.type() == Clutter.EventType.KEY_RELEASE) {
+        if (action == Meta.KeyBindingAction.OVERLAY_KEY) {
             overview.hide();
             return true;
+        }
     }
 
     return false;