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

popupMenu: Add the ability to block sending events to the source actor

Browse Source 
It can be useful to avoid sending enter/leave events to the source actor
of a menu: this would be the case when the source actor isn't a menu item
that should participate in menu navigation but rather is some object
(like an app icon) that we want to indicate corresponds to the menu.

https://bugzilla.gnome.org/show_bug.cgi?id=642871
This commit is contained in:
Owen W. Taylor 2011-03-22 10:29:32 -04:00
parent a5d3259cfe
commit bea2d40f79
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/ui/popupMenu.js
View File

@ -724,6 +724,11 @@ PopupMenuBase.prototype = {
}
this.isOpen = false;
// If set, we don't send events (including crossing events) to the source actor
// for the menu which causes its prelight state to freeze
this.blockSourceEvents = false;
this._activeMenuItem = null;
},
@ -1331,14 +1336,20 @@ PopupMenuManager.prototype = {
return this._activeMenuContains(event.get_source());
},
_eventIsOnAnyMenuSource: function(event) {
_shouldBlockEvent: function(event) {
let src = event.get_source();
if (this._activeMenu != null && this._activeMenu.actor.contains(src))
return false;
for (let i = 0; i < this._menus.length; i++) {
let menu = this._menus[i].menu;
if (menu.sourceActor && menu.sourceActor.contains(src))
return true;
if (menu.sourceActor && !menu.blockSourceEvents && menu.sourceActor.contains(src)) {
return false;
}
}
return false;
return true;
},
_findMenu: function(item) {
@ -1370,7 +1381,7 @@ PopupMenuManager.prototype = {
} else if (eventType == Clutter.EventType.BUTTON_PRESS && !activeMenuContains) {
this._closeMenu();
return true;
} else if (activeMenuContains || this._eventIsOnAnyMenuSource(event)) {
} else if (!this._shouldBlockEvent(event)) {
return false;
}