AppIcon: right-click menu should appear on press, not click

https://bugzilla.gnome.org/show_bug.cgi?id=640583
This commit is contained in:
Dan Winship 2011-01-26 11:15:41 -05:00
parent ab80c5080a
commit c256fa9b9f

View File

@ -328,6 +328,7 @@ AppWellIcon.prototype = {
this.icon = new AppIcon(app, iconParams); this.icon = new AppIcon(app, iconParams);
this.actor.set_child(this.icon.actor); this.actor.set_child(this.icon.actor);
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._menu = null; this._menu = null;
@ -344,7 +345,6 @@ AppWellIcon.prototype = {
Main.overview.endItemDrag(this); Main.overview.endItemDrag(this);
})); }));
this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
this._menuTimeoutId = 0; this._menuTimeoutId = 0;
@ -383,7 +383,11 @@ AppWellIcon.prototype = {
Lang.bind(this, function() { Lang.bind(this, function() {
this.popupMenu(); this.popupMenu();
})); }));
} else if (button == 3) {
this.popupMenu();
return true;
} }
return false;
}, },
_onClicked: function(actor, event) { _onClicked: function(actor, event) {
@ -400,8 +404,6 @@ AppWellIcon.prototype = {
this.app.open_new_window(); this.app.open_new_window();
Main.overview.hide(); Main.overview.hide();
} }
} else if (button == 3) {
this.popupMenu();
} }
return false; return false;
}, },