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

viewSelector: Move the loupe icon to the primary slot

Browse Source 
This matches the behavior in GTK+. See the rationale there.

https://bugzilla.gnome.org/show_bug.cgi?id=695069
This commit is contained in:
Jasper St. Pierre 2013-03-03 13:56:12 -05:00
parent fdb189102d
commit 39610e6933
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/viewSelector.js
View File

@ -83,11 +83,10 @@ const ViewSelector = new Lang.Class({
this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped)); this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged)); global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged));
this._inactiveIcon = new St.Icon({ style_class: 'search-entry-icon', this._entry.set_primary_icon(new St.Icon({ style_class: 'search-entry-icon',
icon_name: 'edit-find-symbolic' }); icon_name: 'edit-find-symbolic' }));
this._activeIcon = new St.Icon({ style_class: 'search-entry-icon', this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
icon_name: 'edit-clear-symbolic' }); icon_name: 'edit-clear-symbolic' });
this._entry.set_secondary_icon(this._inactiveIcon);
this._iconClickedId = 0; this._iconClickedId = 0;
this._capturedEventId = 0; this._capturedEventId = 0;
@ -376,7 +375,7 @@ const ViewSelector = new Lang.Class({
this._searchResults.startingSearch(); this._searchResults.startingSearch();
if (this._searchActive) { if (this._searchActive) {
this._entry.set_secondary_icon(this._activeIcon); this._entry.set_secondary_icon(this._clearIcon);
if (this._iconClickedId == 0) if (this._iconClickedId == 0)
this._iconClickedId = this._entry.connect('secondary-icon-clicked', this._iconClickedId = this._entry.connect('secondary-icon-clicked',
@ -396,7 +395,7 @@ const ViewSelector = new Lang.Class({
this._searchTimeoutId = 0; this._searchTimeoutId = 0;
} }
this._entry.set_secondary_icon(this._inactiveIcon); this._entry.set_secondary_icon(null);
this._searchCancelled(); this._searchCancelled();
} }
}, },