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

grabHelper: Drop addActor/removeActor calls

Browse Source 
These no longer do what they meant to do, and are now unused.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2046>
This commit is contained in:
Carlos Garnacho 2021-11-19 13:31:16 +01:00
parent 1673e87de4
commit d92b71d2b2
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/ui/grabHelper.js
View File

@ -27,44 +27,14 @@ var GrabHelper = class GrabHelper {
this._grabStack = []; this._grabStack = [];
this._actors = [];
this._ignoreUntilRelease = false; this._ignoreUntilRelease = false;
this._modalCount = 0; this._modalCount = 0;
} }
// addActor:
// @actor: an actor
//
// Adds @actor to the set of actors that are allowed to process events
// during a grab.
addActor(actor) {
actor.__grabHelperDestroyId = actor.connect('destroy', () => {
this.removeActor(actor);
});
this._actors.push(actor);
}
// removeActor:
// @actor: an actor
//
// Removes @actor from the set of actors that are allowed to
// process events during a grab.
removeActor(actor) {
let index = this._actors.indexOf(actor);
if (index != -1)
this._actors.splice(index, 1);
if (actor.__grabHelperDestroyId) {
actor.disconnect(actor.__grabHelperDestroyId);
delete actor.__grabHelperDestroyId;
}
}
_isWithinGrabbedActor(actor) { _isWithinGrabbedActor(actor) {
let currentActor = this.currentGrab.actor; let currentActor = this.currentGrab.actor;
while (actor) { while (actor) {
if (this._actors.includes(actor))
return true;
if (actor == currentActor) if (actor == currentActor)
return true; return true;
actor = actor.get_parent(); actor = actor.get_parent();
@ -291,9 +261,6 @@ var GrabHelper = class GrabHelper {
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} }
if (this._isWithinGrabbedActor(event.get_source()))
return Clutter.EVENT_PROPAGATE;
if (Main.keyboard.shouldTakeEvent(event)) if (Main.keyboard.shouldTakeEvent(event))
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;