From dd2ace2e371a586eaba6981d13cea941de8c36a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 23 May 2014 17:14:20 +0200 Subject: [PATCH] viewSelector: Don't re-navigate into the active page Starting keynav into the active page is handled from a key-press handler on the stage, however we should not "start" keynav when we are already navigating elsewhere - the latter can happen when keynav fails (for instance because the focus is trapped inside an open app folder or at the end of the dash), and the event bubbles up to the stage. So make sure to only handle the event to actually start keynav, to not interfere with the normal navigation handling. Thanks to Carlos Soriano for the debugging footwork. https://bugzilla.gnome.org/show_bug.cgi?id=726760 --- js/ui/viewSelector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js index 79fcde6c5..39b521b0c 100644 --- a/js/ui/viewSelector.js +++ b/js/ui/viewSelector.js @@ -282,7 +282,7 @@ const ViewSelector = new Lang.Class({ return Clutter.EVENT_STOP; } else if (this._shouldTriggerSearch(symbol)) { this.startSearch(event); - } else if (!this._searchActive) { + } else if (!this._searchActive && !global.stage.key_focus) { if (symbol == Clutter.Tab || symbol == Clutter.Down) { this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); return true;