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

appDisplay: remove unused parameter to AppWellIcon constructor

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=686984
This commit is contained in:
Cosimo Cecchi 2013-02-17 23:08:41 -05:00
parent ba5860cdd6
commit 6bb38b873b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/appDisplay.js
View File

@ -386,7 +386,7 @@ const AppIcon = new Lang.Class({
const AppWellIcon = new Lang.Class({ const AppWellIcon = new Lang.Class({
Name: 'AppWellIcon', Name: 'AppWellIcon',
_init : function(app, iconParams, onActivateOverride) { _init : function(app, iconParams) {
this.app = app; this.app = app;
this.actor = new St.Button({ style_class: 'app-well-app', this.actor = new St.Button({ style_class: 'app-well-app',
reactive: true, reactive: true,
@ -401,8 +401,6 @@ const AppWellIcon = new Lang.Class({
this.actor.label_actor = this.icon.label; this.actor.label_actor = this.icon.label;
// A function callback to override the default "app.activate()"; used by preferences
this._onActivateOverride = onActivateOverride;
this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress)); this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
this.actor.connect('clicked', Lang.bind(this, this._onClicked)); this.actor.connect('clicked', Lang.bind(this, this._onClicked));
this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu)); this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
@ -539,16 +537,13 @@ const AppWellIcon = new Lang.Class({
this.emit('launching'); this.emit('launching');
let modifiers = event.get_state(); let modifiers = event.get_state();
if (this._onActivateOverride) { if (modifiers & Clutter.ModifierType.CONTROL_MASK
this._onActivateOverride(event); && this.app.state == Shell.AppState.RUNNING) {
this.app.open_new_window(-1);
} else { } else {
if (modifiers & Clutter.ModifierType.CONTROL_MASK this.app.activate();
&& this.app.state == Shell.AppState.RUNNING) {
this.app.open_new_window(-1);
} else {
this.app.activate();
}
} }
Main.overview.hide(); Main.overview.hide();
}, },