[gnome-shell/wip/carlosg/grabs-pt2: 11/22] lookingGlass: Use Clutter.grab() for actor picking




commit bcc452e6b64feff0be2a87e1b8fcd108b73ed661
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Nov 18 00:13:45 2021 +0100

    lookingGlass: Use Clutter.grab() for actor picking

 js/ui/lookingGlass.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index cc5a7e5e47..2b4e0e9918 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -548,12 +548,7 @@ var Inspector = GObject.registerClass({
         eventHandler.connect('scroll-event', this._onScrollEvent.bind(this));
         eventHandler.connect('motion-event', this._onMotionEvent.bind(this));
 
-        let seat = Clutter.get_default_backend().get_default_seat();
-        this._pointerDevice = seat.get_pointer();
-        this._keyboardDevice = seat.get_keyboard();
-
-        this._pointerDevice.grab(eventHandler);
-        this._keyboardDevice.grab(eventHandler);
+        this._grab = global.stage.grab(eventHandler);
 
         // this._target is the actor currently shown by the inspector.
         // this._pointerTarget is the actor directly under the pointer.
@@ -586,8 +581,10 @@ var Inspector = GObject.registerClass({
     }
 
     _close() {
-        this._pointerDevice.ungrab();
-        this._keyboardDevice.ungrab();
+        if (this._grab) {
+            this._grab.dismiss();
+            this._grab = null;
+        }
         this._eventHandler.destroy();
         this._eventHandler = null;
         this.emit('closed');


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