Move positioning funcs to the WindowPositioner

Author: leolost2605

src/ShellClients/ShellClientsManager.vala

@@ -184,14 +184,7 @@ public class Gala.ShellClientsManager : Object {
     }
 
     public void make_centered (Meta.Window window) requires (!is_itself_positioned (window)) {
-        positioned_windows[window] = new WindowPositioner (window, wm, (ref x, ref y) => {
-            unowned var display = wm.get_display ();
-            var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
-            var window_rect = window.get_frame_rect ();
-
-            x = monitor_geom.x + (monitor_geom.width - window_rect.width) / 2;
-            y = monitor_geom.y + (monitor_geom.height - window_rect.height) / 2;
-        });
+        positioned_windows[window] = new WindowPositioner (wm, window, CENTER);
 
         // connect_after so we make sure that any queued move is unqueued
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));

src/ShellClients/WindowPositioner.vala

@@ -6,17 +6,17 @@
  */
 
 public class Gala.WindowPositioner : Object {
-    public delegate void PositionFunc (ref int x, ref int y);
+    public enum Position {
+        CENTER
+    }
 
     public Meta.Window window { get; construct; }
     public WindowManager wm { get; construct; }
+    public Position position { get; private set; }
+    public Variant? position_data { get; private set; }
 
-    private PositionFunc position_func;
-
-    public WindowPositioner (Meta.Window window, WindowManager wm, owned PositionFunc position_func) {
-        Object (window: window, wm: wm);
-
-        this.position_func = (owned) position_func;
+    public WindowPositioner (WindowManager wm, Meta.Window window, Position position, Variant? position_data = null) {
+        Object (wm: wm, window: window, position: position, position_data: position_data);
     }
 
     construct {
@@ -31,9 +31,29 @@ public class Gala.WindowPositioner : Object {
         monitor_manager.monitors_changed_internal.connect (position_window);
     }
 
+    /**
+     * This may only be called after the window was shown.
+     */
+    public void update_position (Position new_position, Variant? new_position_data = null) {
+        position = new_position;
+        position_data = new_position_data;
+
+        position_window ();
+    }
+
     private void position_window () {
         int x = 0, y = 0;
-        position_func (ref x, ref y);
+
+        switch (position) {
+            case CENTER:
+                unowned var display = wm.get_display ();
+                var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
+                var window_rect = window.get_frame_rect ();
+
+                x = monitor_geom.x + (monitor_geom.width - window_rect.width) / 2;
+                y = monitor_geom.y + (monitor_geom.height - window_rect.height) / 2;
+                break;
+        }
 
         window.move_frame (false, x, y);
     }