PopupWindow: pass display instead of wm

Author: lenemter

plugins/pip/Main.vala

@@ -92,7 +92,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
                 var rect = Graphene.Rect.alloc ();
                 rect.init (point_x, point_y, width, height);
 
-                var popup_window = new PopupWindow (wm, active);
+                var popup_window = new PopupWindow (wm.get_display (), active);
                 popup_window.set_container_clip (rect);
                 popup_window.show.connect (on_popup_window_show);
                 popup_window.hide.connect (on_popup_window_hide);
@@ -114,7 +114,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     private void select_window_at (int x, int y) {
         var selected = get_window_actor_at (x, y);
         if (selected != null) {
-            var popup_window = new PopupWindow (wm, selected);
+            var popup_window = new PopupWindow (wm.get_display (), selected);
             popup_window.show.connect (on_popup_window_show);
             popup_window.hide.connect (on_popup_window_hide);
             add_window (popup_window);

plugins/pip/PopupWindow.vala

@@ -16,7 +16,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
     public signal void closed ();
 
-    public Gala.WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
     public Meta.WindowActor window_actor { get; construct; }
 
     private Clutter.Clone clone; // clone itself
@@ -52,12 +52,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
             || window_type == Meta.WindowType.MODAL_DIALOG;
     }
 
-    public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor) {
-        Object (wm: wm, window_actor: window_actor);
+    public PopupWindow (Meta.Display display, Meta.WindowActor window_actor) {
+        Object (display: display, window_actor: window_actor);
     }
 
     construct {
-        unowned var display = wm.get_display ();
         var scale = display.get_monitor_scale (display.get_current_monitor ());
 
         button_size = Gala.Utils.scale_to_int (36, scale);
@@ -133,7 +132,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         window.unmanaged.connect (on_close_click_clicked);
         window.notify["appears-focused"].connect (update_window_focus);
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         workspace_manager.active_workspace_changed.connect (update_window_focus);
     }
 
@@ -215,15 +214,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private Clutter.Actor on_move_begin () {
-        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+        display.set_cursor (Meta.Cursor.DND_IN_DRAG);
 
         return this;
     }
 
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
 #if HAS_MUTTER45
@@ -245,7 +244,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         grab = resize_button.get_stage ().grab (resize_button);
         resize_button.event.connect (on_resize_event);
 
-        wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
+        display.set_cursor (Meta.Cursor.SE_RESIZE);
 
         return Clutter.EVENT_PROPAGATE;
     }
@@ -306,7 +305,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         update_screen_position ();
 
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {
@@ -329,14 +328,14 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void update_window_focus () {
-        unowned Meta.Window focus_window = wm.get_display ().get_focus_window ();
+        unowned Meta.Window focus_window = display.get_focus_window ();
         if ((focus_window != null && !get_window_is_normal (focus_window))
             || (previous_focus != null && !get_window_is_normal (previous_focus))) {
             previous_focus = focus_window;
             return;
         }
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         unowned var active_workspace = workspace_manager.get_active_workspace ();
         unowned var window = window_actor.get_meta_window ();
 
@@ -520,7 +519,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private bool coord_is_in_other_monitor (float coord, Clutter.Orientation axis) {
-        var display = wm.get_display ();
         int n_monitors = display.get_n_monitors ();
 
         if (n_monitors == 1) {
@@ -553,7 +551,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     private void get_current_monitor_rect (out Meta.Rectangle rect) {
 #endif
-        var display = wm.get_display ();
         rect = display.get_monitor_geometry (display.get_current_monitor ());
     }