Make "pick window" button in preferences page works for Gnome 43.1

Author: yilozt

src/dbus/services.ts

@@ -13,6 +13,7 @@ import { load }        from '@me/utils/io'
 // types
 import { WindowActor } from '@gi/Meta'
 import { Me }          from '@global'
+import { Actor }       from '@gi/Clutter'
 // --------------------------------------------------------------- [end imports]
 
 const iface = load (`${Me.path}/dbus/iface.xml`)
@@ -53,16 +54,17 @@ export class Services {
         .filter ((e) => e.toString ().includes (effect_name))
         .forEach ((e) => target.remove_effect (e))
 
-      // Get wm_class_instance property of window, then pass it DBus
-      // client
-      const type_str = target.toString ()
+      let actor: Actor | null = target
 
-      let actor = target as WindowActor
-      if (type_str.includes ('MetaSurfaceActor')) {
-        actor = target.get_parent () as WindowActor
+      // User will pick to a Meta.SurfaceActor in most time, let's find the
+      // associate Meta.WindowActor
+      for (let i = 0; i < 2; i++) {
+        if (actor == null || actor instanceof WindowActor) break
+        // If picked actor is not a Meta.WindowActor, search it's parent
+        actor = actor.get_parent ()
       }
 
-      if (!actor.toString ().includes ('WindowActor')) {
+      if (!(actor instanceof WindowActor)) {
         _send_wm_class_instance ('window-not-found')
         return
       }

src/extension.ts

@@ -1,35 +1,34 @@
 // imports.gi
-import { Point }                         from '@gi/Graphene'
-import * as Clutter                      from '@gi/Clutter'
-import * as GLib                         from '@gi/GLib'
-import { Settings }                      from '@gi/Gio'
-import { WindowActor, WindowClientType } from '@gi/Meta'
+import { Point }                 from '@gi/Graphene'
+import * as Clutter              from '@gi/Clutter'
+import { Settings }              from '@gi/Gio'
+import { WindowClientType }      from '@gi/Meta'
 
 // gnome-shell modules
-import { WindowPreview }                 from '@imports/ui/windowPreview'
-import { WorkspaceGroup }                from '@imports/ui/workspaceAnimation'
-import BackgroundMenu                    from '@imports/ui/backgroundMenu'
-import { layoutManager }                 from '@imports/ui/main'
-import { overview }                      from '@imports/ui/main'
+import { WindowPreview }         from '@imports/ui/windowPreview'
+import { WorkspaceGroup }        from '@imports/ui/workspaceAnimation'
+import BackgroundMenu            from '@imports/ui/backgroundMenu'
+import { layoutManager }         from '@imports/ui/main'
+import { overview }              from '@imports/ui/main'
 
 // local modules
-import { constants }                     from '@me/utils/constants'
-import { stackMsg, _log }                from '@me/utils/log'
-import * as UI                           from '@me/utils/ui'
-import { connections }                   from '@me/utils/connections'
-import { SchemasKeys, settings }         from '@me/utils/settings'
-import { Services }                      from '@me/dbus/services'
-import { LinearFilterEffect }            from '@me/effect/linear_filter_effect'
-import { RoundedCornersEffect }          from '@me/effect/rounded_corners_effect'
-import { init_translations }             from '@me/utils/i18n'
-import { WindowActorTracker }            from '@me/manager/effect_manager'
+import { constants }             from '@me/utils/constants'
+import { stackMsg, _log }        from '@me/utils/log'
+import * as UI                   from '@me/utils/ui'
+import { connections }           from '@me/utils/connections'
+import { SchemasKeys, settings } from '@me/utils/settings'
+import { Services }              from '@me/dbus/services'
+import { LinearFilterEffect }    from '@me/effect/linear_filter_effect'
+import { RoundedCornersEffect }  from '@me/effect/rounded_corners_effect'
+import { init_translations }     from '@me/utils/i18n'
+import { WindowActorTracker }    from '@me/manager/effect_manager'
 
 // types, which will be removed in output
-import { RoundedCornersCfg }             from '@me/utils/types'
-import { ExtensionsWindowActor }         from '@me/utils/types'
-import { Window }                        from '@gi/Meta'
-import { global }                        from '@global'
-import { registerClass }                 from '@gi/GObject'
+import { RoundedCornersCfg }     from '@me/utils/types'
+import { ExtensionsWindowActor } from '@me/utils/types'
+import { Window, WindowActor }   from '@gi/Meta'
+import { global }                from '@global'
+import { registerClass }         from '@gi/GObject'
 
 // --------------------------------------------------------------- [end imports]