Merge branch 'main' into leolost/cleanup-window-overview

Author: zeebok

data/gala.metainfo.xml.in

@@ -27,6 +27,18 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.2.5" date="2025-07-09" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+          <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/gala/issues/2458">Gala still segfaults while closing LibreOffice windows</issue>
+      </issues>
+    </release>
+
     <release version="8.2.4" date="2025-06-30" urgency="medium">
       <description>
         <p>Improvements:</p>

meson.build

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

po/ja.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-06-30 17:54+0000\n"
-"PO-Revision-Date: 2025-06-05 07:55+0000\n"
+"PO-Revision-Date: 2025-07-14 01:55+0000\n"
 "Last-Translator: Ryo Nakano <[email protected]>\n"
 "Language-Team: Japanese <https://l10n.elementaryos.org/projects/desktop/gala/"
 "ja/>\n"
@@ -224,25 +224,26 @@ msgstr "不明なプログラム"
 #: src/Dialogs/CloseDialog.vala:23
 #, c-format
 msgid "“%s” is not responding"
-msgstr "“%s”は応答していません"
+msgstr "“%s”の応答がありません"
 
 #: src/Dialogs/CloseDialog.vala:25
 msgid "Application is not responding"
-msgstr "アプリケーションは応答していません"
+msgstr "アプリケーションの応答がありません"
 
 #: src/Dialogs/CloseDialog.vala:28
 msgid ""
 "You may choose to wait a short while for the application to continue, or "
 "force it to quit entirely."
-msgstr "アプリケーションの再開を待つか、強制終了させるかを選択できます。"
+msgstr "もうしばらくアプリケーションの再開を待つか、完全に強制終了させるかを選択でき"
+"ます。"
 
 #: src/Dialogs/CloseDialog.vala:29
 msgid "Force Quit"
 msgstr "強制終了"
 
 #: src/Dialogs/CloseDialog.vala:30
 msgid "Wait"
-msgstr "待機"
+msgstr "再開を待つ"
 
 #: src/Dialogs/InhibitShortcutsDialog.vala:23
 #, c-format

po/pl.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: gala\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-06-30 17:54+0000\n"
-"PO-Revision-Date: 2025-03-30 11:55+0000\n"
+"PO-Revision-Date: 2025-07-07 19:55+0000\n"
 "Last-Translator: Marcin Serwin <[email protected]>\n"
 "Language-Team: Polish <https://l10n.elementaryos.org/projects/desktop/gala/"
 "pl/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 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-04-20 06:29+0000\n"
 
 #: daemon/DBus.vala:84 daemon-gtk3/BackgroundMenu.vala:11
@@ -135,11 +135,11 @@ msgstr "Stan okna jest teraz zapisywany przy usypianiu i wyłączaniu"
 
 #: data/gala.metainfo.xml.in:103
 msgid "Remove scaling effect from menus"
-msgstr ""
+msgstr "Usuń efekt skalowania z menu"
 
 #: data/gala.metainfo.xml.in:104
 msgid "Swipe up to close windows in Multitasking View"
-msgstr ""
+msgstr "Przeciągnij w górę aby zamknąć okna w widoku wielozadaniowym"
 
 #: data/gala.metainfo.xml.in:135
 msgid "Fixed rare crash when a dock window was killed"
@@ -284,10 +284,9 @@ msgstr "Zrzut ekranu z %s"
 
 #. / TRANSLATORS: %s represents a name of file manager
 #: src/ScreenshotManager.vala:167
-#, fuzzy, c-format
-#| msgid "Show in Files"
+#, c-format
 msgid "Show in %s"
-msgstr "Pokaż w Plikach"
+msgstr "Pokaż w %s"
 
 #: src/ScreenshotManager.vala:174 src/ScreenshotManager.vala:553
 msgid "Screenshot taken"

src/ShellClients/PanelWindow.vala

@@ -31,9 +31,6 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
     private GestureController gesture_controller;
     private HideTracker hide_tracker;
 
-    private int width = -1;
-    private int height = -1;
-
     public PanelWindow (WindowManager wm, Meta.Window window, Pantheon.Desktop.Anchor anchor) {
         Object (wm: wm, anchor: anchor, window: window, position: Position.from_anchor (anchor));
     }
@@ -53,6 +50,8 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
 
         window.size_changed.connect (update_strut);
         window.position_changed.connect (update_strut);
+        notify["width"].connect (update_strut);
+        notify["height"].connect (update_strut);
 
         gesture_controller = new GestureController (DOCK, wm);
         add_gesture_controller (gesture_controller);
@@ -62,32 +61,6 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
         hide_tracker.show.connect (show);
     }
 
-    public Mtk.Rectangle get_custom_window_rect () {
-        var window_rect = window.get_frame_rect ();
-
-        if (width > 0) {
-            window_rect.width = width;
-        }
-
-        if (height > 0) {
-            window_rect.height = height;
-
-            if (anchor == BOTTOM) {
-                var geom = wm.get_display ().get_monitor_geometry (window.get_monitor ());
-                window_rect.y = geom.y + geom.height - height;
-            }
-        }
-
-        return window_rect;
-    }
-
-    public void set_size (int width, int height) {
-        this.width = width;
-        this.height = height;
-
-        update_strut ();
-    }
-
     private void hide () {
         gesture_controller.goto (1);
     }

src/ShellClients/PositionedWindow.vala

@@ -29,6 +29,9 @@ public class Gala.PositionedWindow : Object {
     public Position position { get; construct set; }
     public Variant? position_data { get; construct set; }
 
+    private int width = -1;
+    private int height = -1;
+
     private ulong position_changed_id;
 
     public PositionedWindow (Meta.Window window, Position position, Variant? position_data = null) {
@@ -50,6 +53,30 @@ public class Gala.PositionedWindow : Object {
         notify["position-data"].connect (position_window);
     }
 
+    public Mtk.Rectangle get_custom_window_rect () {
+        var window_rect = window.get_frame_rect ();
+
+        if (width > 0) {
+            window_rect.width = width;
+        }
+
+        if (height > 0) {
+            window_rect.height = height;
+
+            if (position == BOTTOM) {
+                var geom = window.display.get_monitor_geometry (window.get_monitor ());
+                window_rect.y = geom.y + geom.height - height;
+            }
+        }
+
+        return window_rect;
+    }
+
+    public void set_size (int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
     private void position_window () {
         int x = 0, y = 0;
         var window_rect = window.get_frame_rect ();

src/ShellClients/ShellWindow.vala

@@ -29,7 +29,7 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
         window_actor.notify["translation-y"].connect (update_clip);
         notify["position"].connect (update_clip);
 
-        window_actor.notify["height"].connect (update_target);
+        window.size_changed.connect (update_target);
         notify["position"].connect (update_target);
         update_target ();
     }
@@ -93,6 +93,20 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
 
         window_actor.visible = animating || visible;
 
+        if (window_actor.visible) {
+#if HAS_MUTTER48
+            window.display.get_compositor ().disable_unredirect ();
+#else
+            window.display.disable_unredirect ();
+#endif
+        } else {
+#if HAS_MUTTER48
+            window.display.get_compositor ().enable_unredirect ();
+#else
+            window.display.enable_unredirect ();
+#endif
+        }
+
         if (!Meta.Util.is_wayland_compositor ()) {
             if (window_actor.visible) {
                 Utils.x11_unset_window_pass_through (window, restore_previous_x11_region);
@@ -136,11 +150,13 @@ public class Gala.ShellWindow : PositionedWindow, GestureTarget {
     }
 
     private Value calculate_value (bool hidden) {
+        var custom_rect = get_custom_window_rect ();
+
         switch (position) {
             case TOP:
-                return hidden ? -window_actor.height : 0f;
+                return hidden ? -custom_rect.height : 0f;
             case BOTTOM:
-                return hidden ? window_actor.height : 0f;
+                return hidden ? custom_rect.height : 0f;
             default:
                 return hidden ? 0u : 255u;
         }