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

11
js/ui/chrome.js
View File

@ -65,15 +65,6 @@ Chrome.prototype = {
children[i].allocate_preferred_size(flags);
},
_verifyAncestry: function(actor, ancestor) {
while (actor) {
if (actor == ancestor)
return true;
actor = actor.get_parent();
}
return false;
},
// addActor:
// @actor: an actor to add to the chrome layer
// @params: (optional) additional params
@ -195,7 +186,7 @@ Chrome.prototype = {
},
_actorReparented: function(actor, oldParent) {
if (!this._verifyAncestry(actor, this.actor))
if (!this.actor.contains(actor))
this._untrackActor(actor);
},