brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewSelector: Make the search canceling behavior consistent

Browse Source 
When canceling a search pressing Escape while the focus is on the
search entry we clear the entry, set its text to the hint and go back
to the previously selected tab. Make this the behavior also for when
the focus is on search results and not on the entry itself.

https://bugzilla.gnome.org/show_bug.cgi?id=663901
This commit is contained in:
Rui Matos 2012-02-27 15:17:33 +01:00
parent 59ebec25f3
commit d2ba9eb967
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/viewSelector.js
View File

@ -187,14 +187,14 @@ const SearchTab = new Lang.Class({
// incorrectly when we remove focus // incorrectly when we remove focus
// (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */ // (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
if (this._text.text != '') if (this._text.text != '')
this._reset(); this.reset();
}, },
_reset: function () { reset: function () {
this._text.text = '';
global.stage.set_key_focus(null); global.stage.set_key_focus(null);
this._entry.text = '';
this._text.set_cursor_visible(true); this._text.set_cursor_visible(true);
this._text.set_selection(0, 0); this._text.set_selection(0, 0);
}, },
@ -252,7 +252,7 @@ const SearchTab = new Lang.Class({
if (this._iconClickedId == 0) { if (this._iconClickedId == 0) {
this._iconClickedId = this._entry.connect('secondary-icon-clicked', this._iconClickedId = this._entry.connect('secondary-icon-clicked',
Lang.bind(this, function() { Lang.bind(this, function() {
this._reset(); this.reset();
})); }));
} }
this._activate(); this._activate();
@ -280,7 +280,7 @@ const SearchTab = new Lang.Class({
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
if (symbol == Clutter.Escape) { if (symbol == Clutter.Escape) {
if (this._isActivated()) { if (this._isActivated()) {
this._reset(); this.reset();
return true; return true;
} }
} else if (this.active) { } else if (this.active) {
@ -305,7 +305,7 @@ const SearchTab = new Lang.Class({
// the user clicked outside after activating the entry, but // the user clicked outside after activating the entry, but
// with no search term entered and no keyboard button pressed // with no search term entered and no keyboard button pressed
// - cancel the search // - cancel the search
this._reset(); this.reset();
} }
} }
@ -536,6 +536,9 @@ const ViewSelector = new Lang.Class({
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
if (symbol == Clutter.Escape) { if (symbol == Clutter.Escape) {
if (this._searchTab.active)
this._searchTab.reset();
else
Main.overview.hide(); Main.overview.hide();
return true; return true;
} else if (Clutter.keysym_to_unicode(symbol) || } else if (Clutter.keysym_to_unicode(symbol) ||