[gnome-shell/wip/carlosg/grabs-pt3: 107/108] grabHelper: Drop addActor/removeActor calls




commit a8ab6f7bfca866df61844b9d93f07aa8c90039d1
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Nov 19 13:31:16 2021 +0100

    grabHelper: Drop addActor/removeActor calls
    
    These no longer do what they meant to do, and are now unused.

 js/ui/grabHelper.js | 33 ---------------------------------
 1 file changed, 33 deletions(-)
---
diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 47a332a246..11e06700e4 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -27,44 +27,14 @@ var GrabHelper = class GrabHelper {
 
         this._grabStack = [];
 
-        this._actors = [];
         this._ignoreUntilRelease = false;
 
         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) {
         let currentActor = this.currentGrab.actor;
         while (actor) {
-            if (this._actors.includes(actor))
-                return true;
             if (actor == currentActor)
                 return true;
             actor = actor.get_parent();
@@ -291,9 +261,6 @@ var GrabHelper = class GrabHelper {
             return Clutter.EVENT_PROPAGATE;
         }
 
-        if (this._isWithinGrabbedActor(event.get_source()))
-            return Clutter.EVENT_PROPAGATE;
-
         if (Main.keyboard.shouldTakeEvent(event))
             return Clutter.EVENT_PROPAGATE;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]