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

viewSelector: this.active --> this.entryNonEmpty

Browse Source 
'active' isn't terribly clear about just what is active, this variable is
true/false depending on whether or not the search entry has text.

https://bugzilla.gnome.org/show_bug.cgi?id=682050
This commit is contained in:
Tanner Doshier 2012-08-24 11:24:49 -05:00 committed by Jasper St. Pierre
parent 4590b33f2e
commit 66bf0df737
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/viewSelector.js
View File

@ -52,7 +52,7 @@ const ViewSelector = new Lang.Class({
this._activePage = null; this._activePage = null;
this.active = false; this.entryNonEmpty = false;
this._searchPending = false; this._searchPending = false;
this._searchTimeoutId = 0; this._searchTimeoutId = 0;
@ -219,7 +219,7 @@ const ViewSelector = new Lang.Class({
}, },
_onShowAppsButtonToggled: function() { _onShowAppsButtonToggled: function() {
if (this.active) if (this.entryNonEmpty)
this.reset(); this.reset();
else else
this._showPage(this._showAppsButton.checked ? this._appsPage this._showPage(this._showAppsButton.checked ? this._appsPage
@ -235,7 +235,7 @@ 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.active) if (this.entryNonEmpty)
this.reset(); this.reset();
else if (this._showAppsButton.checked) else if (this._showAppsButton.checked)
this._resetShowAppsButton(); this._resetShowAppsButton();
@ -243,9 +243,9 @@ const ViewSelector = new Lang.Class({
Main.overview.hide(); Main.overview.hide();
return true; return true;
} else if (Clutter.keysym_to_unicode(symbol) || } else if (Clutter.keysym_to_unicode(symbol) ||
(symbol == Clutter.BackSpace && this.active)) { (symbol == Clutter.BackSpace && this.entryNonEmpty)) {
this.startSearch(event); this.startSearch(event);
} else if (!this.active) { } else if (!this.entryNonEmpty) {
if (symbol == Clutter.Tab || symbol == Clutter.Down) { if (symbol == Clutter.Tab || symbol == Clutter.Down) {
this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
return true; return true;
@ -320,13 +320,13 @@ const ViewSelector = new Lang.Class({
}, },
_onTextChanged: function (se, prop) { _onTextChanged: function (se, prop) {
let searchPreviouslyActive = this.active; let searchPreviouslyActive = this.entryNonEmpty;
this.active = this._entry.get_text() != ''; this.entryNonEmpty = this._entry.get_text() != '';
this._searchPending = this.active && !searchPreviouslyActive; this._searchPending = this.entryNonEmpty && !searchPreviouslyActive;
if (this._searchPending) { if (this._searchPending) {
this._searchResults.startingSearch(); this._searchResults.startingSearch();
} }
if (this.active) { if (this.entryNonEmpty) {
this.emit('search-begin'); this.emit('search-begin');
this._entry.set_secondary_icon(this._activeIcon); this._entry.set_secondary_icon(this._activeIcon);
@ -344,7 +344,7 @@ const ViewSelector = new Lang.Class({
this._entry.set_secondary_icon(this._inactiveIcon); this._entry.set_secondary_icon(this._inactiveIcon);
this._searchCancelled(); this._searchCancelled();
} }
if (!this.active) { if (!this.entryNonEmpty) {
if (this._searchTimeoutId > 0) { if (this._searchTimeoutId > 0) {
Mainloop.source_remove(this._searchTimeoutId); Mainloop.source_remove(this._searchTimeoutId);
this._searchTimeoutId = 0; this._searchTimeoutId = 0;
@ -372,7 +372,7 @@ const ViewSelector = new Lang.Class({
} }
this._searchResults.activateDefault(); this._searchResults.activateDefault();
return true; return true;
} else if (this.active) { } else if (this.entryNonEmpty) {
let arrowNext, nextDirection; let arrowNext, nextDirection;
if (entry.get_text_direction() == Clutter.TextDirection.RTL) { if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
arrowNext = Clutter.Left; arrowNext = Clutter.Left;