Merge branch 'main' into leolost/panel-window-use-window-positioner

Author: lenemter

data/gala.metainfo.xml.in

@@ -27,7 +27,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="8.0.4" date="2024-11-23" urgency="medium">
+    <release version="8.0.4" date="2024-12-02" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
@@ -36,6 +36,7 @@
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/gala/issues/2101">Dock interacts with the mouse even with the window overlapping</issue>
       </issues>
     </release>
 

meson.build

@@ -1,6 +1,6 @@
 project('gala',
     'c', 'vala',
-    version: '8.0.3',
+    version: '8.0.4',
     meson_version: '>= 0.59.0',
     license: 'GPL3',
 )

po/fi.po

@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: gala\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-11-23 16:06+0000\n"
-"PO-Revision-Date: 2024-08-07 18:17+0000\n"
-"Last-Translator: anonymous <[email protected]>\n"
-"Language-Team: Finnish <https://l10n.elementary.io/projects/desktop/gala/fi/"
-">\n"
+"PO-Revision-Date: 2024-12-02 05:14+0000\n"
+"Last-Translator: Jiri Grönroos <[email protected]>\n"
+"Language-Team: Finnish <https://l10n.elementary.io/projects/desktop/gala/fi/>"
+"\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,14 +33,12 @@ msgid "System Settings…"
 msgstr "Järjestelmän asetukset…"
 
 #: daemon/DBus.vala:207 daemon-gtk3/BackgroundMenu.vala:47
-#, fuzzy
-#| msgid "System Settings…"
 msgid "Failed to open System Settings"
-msgstr "Järjestelmän asetukset…"
+msgstr "Järjestelmän asetusten avaaminen epäonnistui"
 
 #: daemon/DBus.vala:208 daemon-gtk3/BackgroundMenu.vala:48
 msgid "A handler for the “settings://” URI scheme must be installed."
-msgstr ""
+msgstr "Käsittelijä “settings://”-URI-skeemalle pitää olla asennettu."
 
 #: daemon-gtk3/WindowMenu.vala:36 daemon/WindowMenu.vala:38
 msgid "Hide"
@@ -188,11 +186,11 @@ msgstr "Varatyöpöytätiedosto vanhanaikaisten sovellusten ilmoituksia varten."
 #: lib/App.vala:51
 msgctxt "program"
 msgid "Unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #: src/DesktopIntegration.vala:133
 msgid "Window has already focus"
-msgstr ""
+msgstr "Ikkunalla on jo kohdistus"
 
 #: src/Dialogs.vala:144
 #, c-format
@@ -222,23 +220,23 @@ msgstr "Odota"
 #: src/Dialogs.vala:217
 #, c-format
 msgid "“%s” wants to inhibit system shortcuts"
-msgstr ""
+msgstr "“%s” haluaa rajoittaa järjestelmän pikanäppäimiä"
 
 #: src/Dialogs.vala:219
 msgid "An application wants to inhibit system shortcuts"
-msgstr ""
+msgstr "Sovellus haluaa rajoittaa järjestelmän pikanäppäimiä"
 
 #: src/Dialogs.vala:222
 msgid "All system shortcuts will be redirected to the application."
-msgstr ""
+msgstr "Kaikki järjestelmän pikanäppäimet ohjataan sovellukselle."
 
 #: src/Dialogs.vala:223
 msgid "Allow"
 msgstr "Salli"
 
 #: src/Dialogs.vala:224
 msgid "Deny"
-msgstr ""
+msgstr "Estä"
 
 #: src/ScreenshotManager.vala:296
 msgid "Screenshots"
@@ -250,7 +248,7 @@ msgstr "Kuvakaappaus otettu"
 
 #: src/Widgets/WindowSwitcher/WindowSwitcher.vala:73
 msgid "Window switcher"
-msgstr ""
+msgstr "Ikkunavaihdin"
 
 #: src/WindowManager.vala:2355
 #, c-format

src/ShellClients/DelegateActor.vala

@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io)
+ */
+
+/* This class is used to workaround https://github.com/elementary/gala/issues/2101 */
+public class Gala.DelegateActor : GLib.Object {
+    public const int OUT_OF_BOUNDS = 1000000;
+
+    public Meta.WindowActor actor { get; construct; }
+
+    /* Current window actor position or position before the window was moved out of bounds */
+    public float x { get; private set; default = 0.0f; }
+    public float y { get; private set; default = 0.0f; }
+
+    /* Current window position or position before it was moved out of bounds */
+    public int actual_x { get; private set; default = 0; }
+    public int actual_y { get; private set; default = 0; }
+
+    public DelegateActor (Meta.WindowActor actor) {
+        Object (actor: actor);
+    }
+
+    construct {
+        actor.meta_window.position_changed.connect ((_window) => {
+            var rect = _window.get_frame_rect ();
+
+            if (rect.x != OUT_OF_BOUNDS) {
+                actual_x = rect.x;
+                Idle.add_once (() => {
+                    x = actor.x;
+                });
+            }
+            if (rect.y != OUT_OF_BOUNDS) {
+                actual_y = rect.y;
+                Idle.add_once (() => {
+                    y = actor.y;
+                });
+            }
+        });
+    }
+}

src/ShellClients/HideTracker.vala

@@ -41,6 +41,10 @@ public class Gala.HideTracker : Object {
         if (hide_timeout_id != 0) {
             Source.remove (hide_timeout_id);
         }
+
+        if (update_timeout_id != 0) {
+            Source.remove (update_timeout_id);
+        }
     }
 
     construct {
@@ -95,7 +99,7 @@ public class Gala.HideTracker : Object {
         setup_barrier ();
     }
 
-    //Can be removed with mutter > 45
+#if !HAS_MUTTER45
     private bool window_has_pointer () {
         var cursor_tracker = display.get_cursor_tracker ();
         Graphene.Point pointer_pos;
@@ -114,6 +118,7 @@ public class Gala.HideTracker : Object {
         };
         return graphene_window_rect.contains_point (pointer_pos);
     }
+#endif
 
     private void track_focus_window (Meta.Window? window) {
         if (window == null) {

src/ShellClients/PanelClone.vala

@@ -48,8 +48,8 @@ public class Gala.PanelClone : Object {
         actor = (Meta.WindowActor) panel.window.get_compositor_private ();
         // WindowActor position and Window position aren't necessarily the same.
         // The clone needs the actor position
-        actor.notify["x"].connect (update_clone_position);
-        actor.notify["y"].connect (update_clone_position);
+        panel.delegate_actor.notify["x"].connect (update_clone_position);
+        panel.delegate_actor.notify["y"].connect (update_clone_position);
         // Actor visibility might be changed by something else e.g. workspace switch
         // but we want to keep it in sync with us
         actor.notify["visible"].connect (update_visible);
@@ -97,7 +97,7 @@ public class Gala.PanelClone : Object {
         switch (panel.anchor) {
             case TOP:
             case BOTTOM:
-                return actor.x;
+                return panel.delegate_actor.x;
             default:
                 return 0;
         }
@@ -106,9 +106,9 @@ public class Gala.PanelClone : Object {
     private float calculate_clone_y (bool hidden) {
         switch (panel.anchor) {
             case TOP:
-                return hidden ? actor.y - actor.height : actor.y;
+                return hidden ? panel.delegate_actor.y - actor.height : panel.delegate_actor.y;
             case BOTTOM:
-                return hidden ? actor.y + actor.height : actor.y;
+                return hidden ? panel.delegate_actor.y + actor.height : panel.delegate_actor.y;
             default:
                 return 0;
         }
@@ -127,6 +127,10 @@ public class Gala.PanelClone : Object {
 
         panel_hidden = true;
 
+        if (!Meta.Util.is_wayland_compositor ()) {
+            panel.window.move_frame (false, DelegateActor.OUT_OF_BOUNDS, DelegateActor.OUT_OF_BOUNDS);
+        }
+
         if (panel.anchor != TOP && panel.anchor != BOTTOM) {
             warning ("Animated hide not supported for side yet.");
             return;
@@ -146,6 +150,10 @@ public class Gala.PanelClone : Object {
             return;
         }
 
+        if (!Meta.Util.is_wayland_compositor ()) {
+            panel.window.move_frame (false, panel.delegate_actor.actual_x, panel.delegate_actor.actual_y);
+        }
+
         clone.save_easing_state ();
         clone.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
         clone.set_easing_duration (get_animation_duration ());

src/ShellClients/PanelWindow.vala

@@ -15,6 +15,7 @@ public class Gala.PanelWindow : Object {
 
     private WindowPositioner window_positioner;
 
+    public DelegateActor delegate_actor;
     private PanelClone clone;
 
     private int width = -1;
@@ -33,6 +34,7 @@ public class Gala.PanelWindow : Object {
 
         window.stick ();
 
+        delegate_actor = new DelegateActor ((Meta.WindowActor) window.get_compositor_private ());
         clone = new PanelClone (wm, this);
 
         var display = wm.get_display ();
@@ -55,6 +57,8 @@ public class Gala.PanelWindow : Object {
     public Meta.Rectangle get_custom_window_rect () {
 #endif
         var window_rect = window.get_frame_rect ();
+        window_rect.x = delegate_actor.actual_x;
+        window_rect.y = delegate_actor.actual_y;
 
         if (width > 0) {
             window_rect.width = width;

src/WindowManager.vala

@@ -410,10 +410,12 @@ namespace Gala {
         private void launch_action (string action_key) {
             try {
                 var action = behavior_settings.get_string (action_key);
-                if (action != null && action != "") {
+                if (action != null) {
                     Process.spawn_command_line_async (action);
                 }
-            } catch (Error e) { warning (e.message); }
+            } catch (Error e) {
+                warning (e.message);
+            }
         }
 
         private void on_monitors_changed () {
@@ -1045,13 +1047,7 @@ namespace Gala {
                         current.@delete (Gtk.get_current_event_time ());
                     break;
                 case ActionType.OPEN_LAUNCHER:
-                    try {
-                        Process.spawn_command_line_async (
-                            behavior_settings.get_string ("panel-main-menu-action")
-                        );
-                    } catch (Error e) {
-                        warning (e.message);
-                    }
+                    launch_action ("panel-main-menu-action");
                     break;
                 case ActionType.WINDOW_OVERVIEW:
                     if (window_overview == null) {
@@ -1300,6 +1296,8 @@ namespace Gala {
                 case Meta.SizeChange.UNFULLSCREEN:
                     handle_fullscreen_window (window, which_change_local);
                     break;
+                default:
+                    break;
             }
 
             size_change_completed (actor);

src/meson.build

@@ -41,6 +41,7 @@ gala_bin_sources = files(
     'HotCorners/Barrier.vala',
     'HotCorners/HotCorner.vala',
     'HotCorners/HotCornerManager.vala',
+    'ShellClients/DelegateActor.vala',
     'ShellClients/HideTracker.vala',
     'ShellClients/ManagedClient.vala',
     'ShellClients/NotificationsClient.vala',