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

popupMenu: Don't propagate the 'activate' signal on menu items

Browse Source 
We used to do this to close the menu when activating, but now we have
the itemActivated call which explicitly calls up to the toplevel.
This commit is contained in:
Jasper St. Pierre 2013-08-06 10:32:59 -04:00
parent 41117578c5
commit c58a2e8e46
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/popupMenu.js
View File

@ -819,9 +819,6 @@ const PopupMenuBase = new Lang.Class({
} }
if (menuItem instanceof PopupMenuSection) { if (menuItem instanceof PopupMenuSection) {
let activateId = menuItem.connect('activate', Lang.bind(this, function() {
this.emit('activate');
}));
let activeChangeId = menuItem.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged)); let activeChangeId = menuItem.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged));
let parentOpenStateChangedId = this.connect('open-state-changed', function(self, open) { let parentOpenStateChangedId = this.connect('open-state-changed', function(self, open) {
@ -838,7 +835,6 @@ const PopupMenuBase = new Lang.Class({
})); }));
menuItem.connect('destroy', Lang.bind(this, function() { menuItem.connect('destroy', Lang.bind(this, function() {
menuItem.disconnect(activateId);
menuItem.disconnect(activeChangeId); menuItem.disconnect(activeChangeId);
this.disconnect(subMenuSensitiveChangedId); this.disconnect(subMenuSensitiveChangedId);
this.disconnect(parentOpenStateChangedId); this.disconnect(parentOpenStateChangedId);
@ -852,16 +848,12 @@ const PopupMenuBase = new Lang.Class({
this.box.insert_child_below(menuItem.menu.actor, before_item); this.box.insert_child_below(menuItem.menu.actor, before_item);
this._connectItemSignals(menuItem); this._connectItemSignals(menuItem);
let subMenuActivateId = menuItem.connect('activate', Lang.bind(this, function() {
this.emit('activate');
}));
let subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged)); let subMenuActiveChangeId = menuItem.menu.connect('active-changed', Lang.bind(this, this._subMenuActiveChanged));
let closingId = this.connect('menu-closed', function() { let closingId = this.connect('menu-closed', function() {
menuItem.menu.close(BoxPointer.PopupAnimation.NONE); menuItem.menu.close(BoxPointer.PopupAnimation.NONE);
}); });
menuItem.connect('destroy', Lang.bind(this, function() { menuItem.connect('destroy', Lang.bind(this, function() {
menuItem.menu.disconnect(subMenuActivateId);
menuItem.menu.disconnect(subMenuActiveChangeId); menuItem.menu.disconnect(subMenuActiveChangeId);
this.disconnect(closingId); this.disconnect(closingId);
})); }));