Introduce a WindowPositioner

Author: leolost2605

src/ShellClients/ShellClientsManager.vala

@@ -25,8 +25,8 @@ public class Gala.ShellClientsManager : Object {
     private NotificationsClient notifications_client;
     private ManagedClient[] protocol_clients = {};
 
-    private GLib.HashTable<Meta.Window, PanelWindow> windows = new GLib.HashTable<Meta.Window, PanelWindow> (null, null);
-    private GLib.HashTable<Meta.Window, CenteredWindow> centered_windows = new GLib.HashTable<Meta.Window, CenteredWindow> (null, null);
+    private GLib.HashTable<Meta.Window, PanelWindow> panel_windows = new GLib.HashTable<Meta.Window, PanelWindow> (null, null);
+    private GLib.HashTable<Meta.Window, WindowPositioner> positioned_windows = new GLib.HashTable<Meta.Window, WindowPositioner> (null, null);
 
     private ShellClientsManager (WindowManager wm) {
         Object (wm: wm);
@@ -144,18 +144,18 @@ public class Gala.ShellClientsManager : Object {
     }
 
     public void set_anchor (Meta.Window window, Meta.Side side) {
-        if (window in windows) {
-            windows[window].update_anchor (side);
+        if (window in panel_windows) {
+            panel_windows[window].update_anchor (side);
             return;
         }
 
         make_dock (window);
         // TODO: Return if requested by window that's not a trusted client?
 
-        windows[window] = new PanelWindow (wm, window, side);
+        panel_windows[window] = new PanelWindow (wm, window, side);
 
         // connect_after so we make sure the PanelWindow can destroy its barriers and struts
-        window.unmanaging.connect_after (() => windows.remove (window));
+        window.unmanaging.connect_after ((_window) => panel_windows.remove (_window));
     }
 
     /**
@@ -166,37 +166,45 @@ public class Gala.ShellClientsManager : Object {
      * TODO: Maybe use for strut only?
      */
     public void set_size (Meta.Window window, int width, int height) {
-        if (!(window in windows)) {
+        if (!(window in panel_windows)) {
             warning ("Set anchor for window before size.");
             return;
         }
 
-        windows[window].set_size (width, height);
+        panel_windows[window].set_size (width, height);
     }
 
     public void set_hide_mode (Meta.Window window, Pantheon.Desktop.HideMode hide_mode) {
-        if (!(window in windows)) {
+        if (!(window in panel_windows)) {
             warning ("Set anchor for window before hide mode.");
             return;
         }
 
-        windows[window].set_hide_mode (hide_mode);
+        panel_windows[window].set_hide_mode (hide_mode);
     }
 
-    public void make_centered (Meta.Window window) {
-        if (window in centered_windows) {
-            return;
-        }
+    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 ();
 
-        centered_windows[window] = new CenteredWindow (wm, window);
+            x = monitor_geom.x + (monitor_geom.width - window_rect.width) / 2;
+            y = monitor_geom.y + (monitor_geom.height - window_rect.height) / 2;
+        });
+
+        // connect_after so we make sure that any queued move is unqueued
+        window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
+    }
 
-        window.unmanaging.connect_after (() => centered_windows.remove (window));
+    private bool is_itself_positioned (Meta.Window window) {
+        return (window in positioned_windows) || (window in panel_windows);
     }
 
     public bool is_positioned_window (Meta.Window window) {
-        bool positioned = (window in centered_windows) || (window in windows);
+        bool positioned = is_itself_positioned (window);
         window.foreach_ancestor ((ancestor) => {
-            if (ancestor in centered_windows || ancestor in windows) {
+            if (ancestor in positioned_windows || ancestor in panel_windows) {
                 positioned = true;
             }
 

src/ShellClients/CenteredWindow.vala renamed to src/ShellClients/WindowPositioner.vala

@@ -5,27 +5,35 @@
  * Authored by: Leonhard Kargl <[email protected]>
  */
 
-public class Gala.CenteredWindow : Object {
-    public WindowManager wm { get; construct; }
+public class Gala.WindowPositioner : Object {
+    public delegate void PositionFunc (ref int x, ref int y);
+
     public Meta.Window window { get; construct; }
+    public WindowManager wm { get; construct; }
+
+    private PositionFunc position_func;
 
     private uint idle_move_id = 0;
 
-    public CenteredWindow (WindowManager wm, Meta.Window window) {
-        Object (wm: wm, window: window);
+    public WindowPositioner (Meta.Window window, WindowManager wm, owned PositionFunc position_func) {
+        Object (window: window, wm: wm);
+
+        this.position_func = (owned) position_func;
     }
 
     construct {
-        window.size_changed.connect (position_window);
         window.stick ();
 
+        window.size_changed.connect (position_window);
+        window.position_changed.connect (position_window);
+        window.shown.connect (position_window);
+
         var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
-        monitor_manager.monitors_changed.connect (() => position_window ());
+        monitor_manager.monitors_changed.connect (position_window);
+        monitor_manager.monitors_changed_internal.connect (position_window);
 
         position_window ();
 
-        window.shown.connect (() => window.focus (wm.get_display ().get_current_time ()));
-
         window.unmanaging.connect (() => {
             if (idle_move_id != 0) {
                 Source.remove (idle_move_id);
@@ -34,18 +42,14 @@ public class Gala.CenteredWindow : Object {
     }
 
     private void position_window () {
-        var display = wm.get_display ();
-        var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
-        var window_rect = window.get_frame_rect ();
-
-        var x = monitor_geom.x + (monitor_geom.width - window_rect.width) / 2;
-        var y = monitor_geom.y + (monitor_geom.height - window_rect.height) / 2;
-
         if (idle_move_id != 0) {
             Source.remove (idle_move_id);
         }
 
         idle_move_id = Idle.add (() => {
+            int x = 0, y = 0;
+            position_func (ref x, ref y);
+
             window.move_frame (false, x, y);
 
             idle_move_id = 0;

src/meson.build

@@ -41,13 +41,13 @@ gala_bin_sources = files(
     'HotCorners/Barrier.vala',
     'HotCorners/HotCorner.vala',
     'HotCorners/HotCornerManager.vala',
-    'ShellClients/CenteredWindow.vala',
     'ShellClients/HideTracker.vala',
     'ShellClients/ManagedClient.vala',
     'ShellClients/NotificationsClient.vala',
     'ShellClients/PanelClone.vala',
     'ShellClients/PanelWindow.vala',
     'ShellClients/ShellClientsManager.vala',
+    'ShellClients/WindowPositioner.vala',
     'Widgets/DwellClickTimer.vala',
     'Widgets/IconGroup.vala',
     'Widgets/IconGroupContainer.vala',