From e2a9b27b2b62d6662b321c94b1e2dc5dfa33677a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 19 Feb 2014 01:44:58 +0100 Subject: [PATCH] Revert "viewSelector: Give the active page key focus when it is shown" This broke keyboard navigation in the app picker, which is not an acceptable regression for the release. This reverts commit ec2bb039ae7ab3f3504bfe0fdba6c715f5a838fd. --- js/ui/viewSelector.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js index be046b1f0..79fcde6c5 100644 --- a/js/ui/viewSelector.js +++ b/js/ui/viewSelector.js @@ -187,7 +187,6 @@ const ViewSelector = new Lang.Class({ params = Params.parse(params, { a11yFocus: null }); let page = new St.Bin({ child: actor, - visible: false, x_align: St.Align.START, y_align: St.Align.START, x_fill: true, @@ -212,7 +211,7 @@ const ViewSelector = new Lang.Class({ oldPage.hide(); this.emit('page-empty'); - this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); + this._activePage.show(); Tweener.addTween(this._activePage, { opacity: 255, @@ -283,6 +282,14 @@ const ViewSelector = new Lang.Class({ return Clutter.EVENT_STOP; } else if (this._shouldTriggerSearch(symbol)) { this.startSearch(event); + } else if (!this._searchActive) { + if (symbol == Clutter.Tab || symbol == Clutter.Down) { + this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); + return true; + } else if (symbol == Clutter.ISO_Left_Tab) { + this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_BACKWARD, false); + return true; + } } return Clutter.EVENT_PROPAGATE; },