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

search: Allow providers to return the complete result object

Browse Source 
This makes the existing createResultObject() match its name better
 and avoids oddities like nested StButtons in app search results.

https://bugzilla.gnome.org/show_bug.cgi?id=734726
This commit is contained in:
Florian Müllner
2014-08-20 18:39:02 +02:00
committed by Carlos Soriano
parent e933302ae4
commit 67c216a6fe
3 changed files with 38 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
js/ui/appDisplay.js
View File

@@ -1054,18 +1054,6 @@ const AppSearchProvider = new Lang.Class({
this.getInitialResultSet(terms, callback, cancellable);
},
activateResult: function(result) {
let app = this._appSys.lookup_app(result);
let event = Clutter.get_current_event();
let modifiers = event ? event.get_state() : 0;
let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK;
if (openNewWindow)
app.open_new_window(-1);
else
app.activate();
},
dragActivateResult: function(id, params) {
params = Params.parse(params, { workspace: -1,
timestamp: 0 });
@@ -1650,13 +1638,7 @@ const AppIcon = new Lang.Class({
_onClicked: function(actor, button) {
this._removeMenuTimeout();
if (button == 0 || button == 1) {
this._onActivate(Clutter.get_current_event());
} else if (button == 2) {
this.app.open_new_window(-1);
Main.overview.hide();
}
this.activate(button);
},
_onKeyboardPopupMenu: function() {
@@ -1710,15 +1692,17 @@ const AppIcon = new Lang.Class({
this.emit('menu-state-changed', false);
},
_onActivate: function (event) {
let modifiers = event.get_state();
activate: function (button) {
let event = Clutter.get_current_event();
let modifiers = event ? event.get_state() : 0;
let openNewWindow = modifiers & Clutter.ModifierType.CONTROL_MASK &&
this.app.state == Shell.AppState.RUNNING ||
button && button == 2;
if (modifiers & Clutter.ModifierType.CONTROL_MASK
&& this.app.state == Shell.AppState.RUNNING) {
if (openNewWindow)
this.app.open_new_window(-1);
} else {
else
this.app.activate();
}
Main.overview.hide();
},