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

popup-menu: Add minimal handling of open/close to Sections

Browse Source 
SubMenuMenuItems close automatically with their parent, however
closing fails when the parent item is a MenuSection, as those
currently ignore any open()/close() requests.
At some minimal handling by emitting the 'open-state-changed' signal,
so children like SubMenuMenuItems work as expected.

https://bugzilla.gnome.org/show_bug.cgi?id=661029
This commit is contained in:
Florian Müllner 2011-10-07 20:17:44 +02:00
parent 70fc13500d
commit 398489f661
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/popupMenu.js
View File

@ -1019,6 +1019,11 @@ PopupMenuBase.prototype = {
} }
if (menuItem instanceof PopupMenuSection) { if (menuItem instanceof PopupMenuSection) {
this._connectSubMenuSignals(menuItem, menuItem); this._connectSubMenuSignals(menuItem, menuItem);
menuItem._closingId = this.connect('open-state-changed',
function(self, open) {
if (!open)
menuItem.close(false);
});
menuItem.connect('destroy', Lang.bind(this, function() { menuItem.connect('destroy', Lang.bind(this, function() {
menuItem.disconnect(menuItem._subMenuActivateId); menuItem.disconnect(menuItem._subMenuActivateId);
menuItem.disconnect(menuItem._subMenuActiveChangeId); menuItem.disconnect(menuItem._subMenuActiveChangeId);
@ -1418,9 +1423,10 @@ PopupMenuSection.prototype = {
this.isOpen = true; this.isOpen = true;
}, },
// deliberately ignore any attempt to open() or close() // deliberately ignore any attempt to open() or close(), but emit the
open: function(animate) { }, // corresponding signal so children can still pick it up
close: function() { }, open: function(animate) { this.emit('open-state-changed', true); },
close: function() { this.emit('open-state-changed', false); },
} }
function PopupSubMenuMenuItem() { function PopupSubMenuMenuItem() {