Merge branch 'main' into lenemter/gala-text

Author: leonardo-lemos

data/gala.metainfo.xml.in

@@ -27,6 +27,18 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.2.4" date="2025-06-12" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+          <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/gala/issues/2438">Gala randomly segfaults while closing Libreoffice windows</issue>
+      </issues>
+    </release>
+
     <release version="8.2.3" date="2025-05-20" urgency="medium">
       <description>
         <p>Improvements:</p>

lib/Drawing/StyleManager.vala

@@ -18,11 +18,16 @@ public class Gala.Drawing.StyleManager : Object {
     }
 
     [DBus (name="io.elementary.pantheon.AccountsService")]
-    private interface AccountsService : DBusProxy {
+    private interface PantheonAccountsService : DBusProxy {
         public abstract int prefers_color_scheme { get; set; }
         public abstract int prefers_accent_color { get; set; }
     }
 
+    [DBus (name="io.elementary.SettingsDaemon.AccountsService")]
+    private interface SettingsDaemonAccountsService : DBusProxy {
+        public abstract int accent_color { get; set; }
+    }
+
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
     private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";
 
@@ -37,10 +42,18 @@ public class Gala.Drawing.StyleManager : Object {
     public ColorScheme prefers_color_scheme { get; private set; default = LIGHT; }
     public Gdk.RGBA theme_accent_color { get; private set; default = DEFAULT_ACCENT_COLOR; }
 
-    private AccountsService? accounts_service_proxy;
+    private PantheonAccountsService? pantheon_proxy;
+    private SettingsDaemonAccountsService? settings_daemon_proxy;
 
     construct {
-        Bus.watch_name (SYSTEM, FDO_ACCOUNTS_NAME, NONE, () => connect_to_accounts_service.begin (), () => accounts_service_proxy = null);
+        Bus.watch_name (
+            SYSTEM, FDO_ACCOUNTS_NAME, NONE,
+            () => connect_to_accounts_service.begin (),
+            () => {
+                pantheon_proxy = null;
+                settings_daemon_proxy = null;
+            }
+        );
     }
 
     private async void connect_to_accounts_service () {
@@ -49,24 +62,27 @@ public class Gala.Drawing.StyleManager : Object {
 
             var path = yield accounts.find_user_by_name (Environment.get_user_name ());
 
-            accounts_service_proxy = yield Bus.get_proxy<AccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
+            pantheon_proxy = yield Bus.get_proxy<PantheonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
+            settings_daemon_proxy = yield Bus.get_proxy<SettingsDaemonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
         } catch {
             warning ("Could not connect to AccountsService. Default accent color will be used");
             return;
         }
 
-        update_color_scheme (accounts_service_proxy.prefers_color_scheme);
-        update_color (accounts_service_proxy.prefers_accent_color);
+        update_color_scheme (pantheon_proxy.prefers_color_scheme);
+        update_color (settings_daemon_proxy.accent_color);
 
-        accounts_service_proxy.g_properties_changed.connect ((changed, invalid) => {
-            var value = changed.lookup_value ("PrefersAccentColor", new VariantType ("i"));
+        pantheon_proxy.g_properties_changed.connect ((changed, invalid) => {
+            var value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
             if (value != null) {
-                update_color (value.get_int32 ());
+                update_color_scheme (value.get_int32 ());
             }
+        });
 
-            value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
+        settings_daemon_proxy.g_properties_changed.connect ((changed, invalid) => {
+            var value = changed.lookup_value ("AccentColor", new VariantType ("i"));
             if (value != null) {
-                update_color_scheme (value.get_int32 ());
+                update_color (value.get_int32 ());
             }
         });
     }

po/uk.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: beat-box\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-06-09 20:49+0000\n"
-"PO-Revision-Date: 2025-04-18 01:55+0000\n"
+"PO-Revision-Date: 2025-06-11 07:55+0000\n"
 "Last-Translator: Ihor Hordiichuk <[email protected]>\n"
 "Language-Team: Ukrainian <https://l10n.elementaryos.org/projects/desktop/"
 "gala/uk/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.10.4\n"
+"X-Generator: Weblate 5.11.4\n"
 "X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
 
 #: daemon/DBus.vala:84 daemon-gtk3/BackgroundMenu.vala:11
@@ -286,14 +286,13 @@ msgstr "Знімок екрана від %s"
 #: src/ScreenshotManager.vala:171
 #, c-format
 msgid "Open in %s"
-msgstr ""
+msgstr "Відкрити в %s"
 
 #. / TRANSLATORS: %s represents a name of file manager
 #: src/ScreenshotManager.vala:178
-#, fuzzy, c-format
-#| msgid "Show in Files"
+#, c-format
 msgid "Show in %s"
-msgstr "Показати у Файлах"
+msgstr "Показати у %s"
 
 #: src/ScreenshotManager.vala:189 src/ScreenshotManager.vala:548
 msgid "Screenshot taken"

src/DesktopIntegration.vala

@@ -37,10 +37,7 @@ public class Gala.DesktopIntegration : GLib.Object {
         unowned var display = wm.get_display ();
         unowned var workspace_manager = display.get_workspace_manager ();
 
-        workspace_manager.active_workspace_changed.connect (() => {
-            active_workspace_changed ();
-            windows_changed (); // windows have 'on-active-workspace' property that we need to update
-        });
+        workspace_manager.active_workspace_changed.connect (() => active_workspace_changed ());
         workspace_manager.workspaces_reordered.connect (() => windows_changed ());
         workspace_manager.workspace_added.connect (() => windows_changed ());
         workspace_manager.workspace_removed.connect ((index) => {
@@ -99,7 +96,6 @@ public class Gala.DesktopIntegration : GLib.Object {
     public Window[] get_windows () throws GLib.DBusError, GLib.IOError {
         Window[] returned_windows = {};
         var apps = Gala.AppSystem.get_default ().get_running_apps ();
-        unowned var active_workspace = wm.get_display ().get_workspace_manager ().get_active_workspace ();
         foreach (unowned var app in apps) {
             foreach (weak Meta.Window window in app.get_windows ()) {
                 if (!is_eligible_window (window)) {
@@ -116,7 +112,6 @@ public class Gala.DesktopIntegration : GLib.Object {
                 properties.insert ("client-type", new GLib.Variant.uint32 (window.get_client_type ()));
                 properties.insert ("is-hidden", new GLib.Variant.boolean (window.is_hidden ()));
                 properties.insert ("has-focus", new GLib.Variant.boolean (window.has_focus ()));
-                properties.insert ("on-active-workspace", new GLib.Variant.boolean (window.located_on_workspace (active_workspace)));
                 properties.insert ("workspace-index", new GLib.Variant.int32 (window.get_workspace ().index ()));
                 properties.insert ("width", new GLib.Variant.uint32 (frame_rect.width));
                 properties.insert ("height", new GLib.Variant.uint32 (frame_rect.height));

src/InternalUtils.vala

@@ -350,5 +350,11 @@ namespace Gala {
             Clutter.get_default_backend ().get_default_seat ().bell_notify ();
 #endif
         }
+
+        public static bool get_x11_in_fullscreen (Meta.Display display) {
+            var primary_monitor = display.get_primary_monitor ();
+            var is_in_fullscreen = display.get_monitor_in_fullscreen (primary_monitor);
+            return !Meta.Util.is_wayland_compositor () && is_in_fullscreen;
+        }
     }
 }

src/ShellClients/HideTracker.vala

@@ -15,16 +15,18 @@ public class Gala.HideTracker : Object {
 
     public Meta.Display display { get; construct; }
     public unowned PanelWindow panel { get; construct; }
-
     public Pantheon.Desktop.HideMode hide_mode { get; set; }
 
+    private static GLib.Settings behavior_settings;
+
     private Clutter.PanAction pan_action;
 
     private bool hovered = false;
 
     private bool overlap = false;
     private bool focus_overlap = false;
     private bool focus_maximized_overlap = false;
+    private bool fullscreen_overlap = false;
 
     private Meta.Window current_focus_window;
 
@@ -37,6 +39,10 @@ public class Gala.HideTracker : Object {
         Object (display: display, panel: panel);
     }
 
+    static construct {
+        behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
+    }
+
     construct {
         panel.window.unmanaging.connect_after (() => {
             // The timeouts hold refs on us so we stay connected to signal handlers that might
@@ -145,6 +151,7 @@ public class Gala.HideTracker : Object {
         overlap = false;
         focus_overlap = false;
         focus_maximized_overlap = false;
+        fullscreen_overlap = display.get_monitor_in_fullscreen (panel.window.get_monitor ());
 
         foreach (var window in display.get_workspace_manager ().get_active_workspace ().list_windows ()) {
             if (window == panel.window) {
@@ -195,16 +202,17 @@ public class Gala.HideTracker : Object {
                 toggle_display (true);
                 break;
 
-            default:
-                warning ("HideTracker: unsupported hide mode.");
+            case NEVER:
+                toggle_display (fullscreen_overlap);
                 break;
         }
     }
 
     private void toggle_display (bool should_hide) {
         hovered = panel.window.has_pointer ();
 
-        if (should_hide && !hovered && !panel.window.has_focus ()) {
+        // Showing panels in fullscreen is broken in X11
+        if (should_hide && !hovered && !panel.window.has_focus () || InternalUtils.get_x11_in_fullscreen (display)) {
             trigger_hide ();
         } else {
             trigger_show ();
@@ -331,7 +339,14 @@ public class Gala.HideTracker : Object {
     }
 
     private void on_barrier_triggered () {
-        trigger_show ();
-        schedule_update ();
+        // Showing panels in fullscreen is broken in X11
+        if (InternalUtils.get_x11_in_fullscreen (display)) {
+            return;
+        }
+
+        if (hide_mode != NEVER || behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")) {
+            trigger_show ();
+            schedule_update ();
+        }
     }
 }

src/ShellClients/PanelWindow.vala

@@ -15,28 +15,21 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
 
     public Pantheon.Desktop.HideMode hide_mode {
         get {
-            return hide_tracker == null ? Pantheon.Desktop.HideMode.NEVER : hide_tracker.hide_mode;
+            return hide_tracker.hide_mode;
         }
         set {
+            hide_tracker.hide_mode = value;
+
             if (value == NEVER) {
-                hide_tracker = null;
-                show ();
                 make_exclusive ();
-                return;
-            } else if (hide_tracker == null) {
+            } else {
                 unmake_exclusive ();
-
-                hide_tracker = new HideTracker (wm.get_display (), this);
-                hide_tracker.hide.connect (hide);
-                hide_tracker.show.connect (show);
             }
-
-            hide_tracker.hide_mode = value;
         }
     }
 
     private GestureController gesture_controller;
-    private HideTracker? hide_tracker;
+    private HideTracker hide_tracker;
 
     private int width = -1;
     private int height = -1;
@@ -64,15 +57,9 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
         gesture_controller = new GestureController (DOCK, wm);
         add_gesture_controller (gesture_controller);
 
-        window.display.in_fullscreen_changed.connect (() => {
-            if (wm.get_display ().get_monitor_in_fullscreen (window.get_monitor ())) {
-                hide ();
-            } else if (hide_mode == NEVER) {
-                show ();
-            } else {
-                hide_tracker.update_overlap ();
-            }
-        });
+        hide_tracker = new HideTracker (wm.get_display (), this);
+        hide_tracker.hide.connect (hide);
+        hide_tracker.show.connect (show);
     }
 
     public Mtk.Rectangle get_custom_window_rect () {
@@ -106,10 +93,6 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
     }
 
     private void show () {
-        if (window.display.get_monitor_in_fullscreen (window.get_monitor ())) {
-            return;
-        }
-
         gesture_controller.goto (0);
     }
 

src/WindowManager.vala

@@ -19,6 +19,7 @@
 namespace Gala {
     public class WindowManagerGala : Meta.Plugin, WindowManager {
         private const string OPEN_MULTITASKING_VIEW = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1";
+        private const string OPEN_APPLICATIONS_MENU = "io.elementary.wingpanel --toggle-indicator=app-launcher";
 
         /**
          * {@inheritDoc}
@@ -329,6 +330,13 @@ namespace Gala {
             });
 
             display.overlay_key.connect (() => {
+                // Showing panels in fullscreen is broken in X11
+                if (InternalUtils.get_x11_in_fullscreen (display) &&
+                    behavior_settings.get_string ("overlay-action") == OPEN_APPLICATIONS_MENU
+                ) {
+                    return;
+                }
+
                 launch_action (ActionKeys.OVERLAY_ACTION);
             });
 

src/WindowStateSaver.vala

@@ -147,7 +147,10 @@ public class Gala.WindowStateSaver : GLib.Object {
         var app_id = GLib.Markup.escape_text (window_tracker.get_app_for_window (window).id);
 
         var window_index = find_window_index (window, app_id);
-        app_windows[app_id].remove_index (window_index);
+        if (window_index < app_windows[app_id].length) {
+            app_windows[app_id].remove_index (window_index);
+        }
+
         var value = null; // insert_val requires lvalue
         app_windows[app_id].insert_val (window_index, value);