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

De-duplicate "actor contains actor" code

Browse Source 
Add _st_actor_contains() in st-private for use within St, and
monkey-patch in a Clutter.Actor.contains() for use by javascript, and
then replace all the duplicate implementations with one or the other
of those.

https://bugzilla.gnome.org/show_bug.cgi?id=621197
This commit is contained in:
Dan Winship
2010-06-10 08:15:02 -04:00
parent e6a70e4676
commit a4befeba53
10 changed files with 38 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/popupMenu.js
View File

@ -494,28 +494,17 @@ PopupMenuManager.prototype = {
this.ungrab();
},
_containsActor: function(container, actor) {
let parent = actor;
while (parent != null) {
if (parent == container)
return true;
parent = parent.get_parent();
}
return false;
},
_eventIsOnActiveMenu: function(event) {
let src = event.get_source();
return this._activeMenu != null
&& (this._containsActor(this._activeMenu.actor, src) ||
this._containsActor(this._activeMenu.sourceActor, src));
&& (this._activeMenu.actor.contains(src) ||
this._activeMenu.sourceActor.contains(src));
},
_eventIsOnAnyMenuSource: function(event) {
let src = event.get_source();
for (let i = 0; i < this._menus.length; i++) {
let actor = this._menus[i].sourceActor;
if (this._containsActor(actor, src))
if (this._menus[i].sourceActor.contains(src))
return true;
}
return false;