Merge branch 'main' into leolost/fix-moving-stacking-order

Author: leolost2605

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: 2024-12-18 21:23+0000\n"
-"PO-Revision-Date: 2024-11-28 12:16+0000\n"
+"PO-Revision-Date: 2024-12-22 20:56+0000\n"
 "Last-Translator: Ryo Nakano <[email protected]>\n"
 "Language-Team: Japanese <https://l10n.elementary.io/projects/desktop/gala/ja/"
 ">\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 "X-Launchpad-Export-Date: 2017-03-02 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,17 +127,15 @@ msgstr "翻訳の更新"
 
 #: data/gala.metainfo.xml.in:35
 msgid "Fixed rare crash when a dock window was killed"
-msgstr ""
+msgstr "ドックウィンドウが強制終了されると、まれにクラッシュする不具合を修正"
 
 #: data/gala.metainfo.xml.in:36
 msgid "Added interactive screenshot shortcut"
-msgstr ""
+msgstr "対話式スクリーンショットのショートカットを追加"
 
 #: data/gala.metainfo.xml.in:37
-#, fuzzy
-#| msgid "Fix potential crash when taking screenshots"
 msgid "Fixed crash when using tiling shortcuts"
-msgstr "スクリーンショットを撮る際に起こりうるクラッシュを修正"
+msgstr "ウィンドウを並べるショートカット使用時のクラッシュを修正"
 
 #: data/gala.metainfo.xml.in:56
 msgid "Improved shadows performance"

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: 2024-12-18 21:23+0000\n"
-"PO-Revision-Date: 2024-11-27 02:16+0000\n"
+"PO-Revision-Date: 2024-12-24 00:16+0000\n"
 "Last-Translator: Ihor Hordiichuk <[email protected]>\n"
 "Language-Team: Ukrainian <https://l10n.elementary.io/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.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 "X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,17 +127,15 @@ msgstr "Оновлені переклади"
 
 #: data/gala.metainfo.xml.in:35
 msgid "Fixed rare crash when a dock window was killed"
-msgstr ""
+msgstr "Виправлено рідкісний збій вікна док-станції"
 
 #: data/gala.metainfo.xml.in:36
 msgid "Added interactive screenshot shortcut"
-msgstr ""
+msgstr "Додано інтерактивний ярлик створення знімка екрана"
 
 #: data/gala.metainfo.xml.in:37
-#, fuzzy
-#| msgid "Fix potential crash when taking screenshots"
 msgid "Fixed crash when using tiling shortcuts"
-msgstr "Виправлено ймовірність збою під час створення знімків екрана"
+msgstr "Виправлено збій під час використання комбінацій клавіш на плитці"
 
 #: data/gala.metainfo.xml.in:56
 msgid "Improved shadows performance"

src/Widgets/WindowClone.vala

@@ -165,7 +165,9 @@ public class Gala.WindowClone : Clutter.Actor {
         };
         close_button.triggered.connect (close_window);
 
-        window_icon = new WindowIcon (window, WINDOW_ICON_SIZE, (int)Math.round (monitor_scale_factor));
+        window_icon = new WindowIcon (window, WINDOW_ICON_SIZE, (int)Math.round (monitor_scale_factor)) {
+            visible = !overview_mode
+        };
         window_icon.opacity = 0;
         window_icon.set_pivot_point (0.5f, 0.5f);
 
@@ -340,6 +342,15 @@ public class Gala.WindowClone : Clutter.Actor {
         var close_button_alloc = InternalUtils.actor_box_from_rect (close_button_x, -close_button_height * 0.33f, close_button_width, close_button_height);
         close_button.allocate (close_button_alloc);
 
+        float window_icon_width, window_icon_height;
+        window_icon.get_preferred_size (null, null, out window_icon_width, out window_icon_height);
+
+        var window_icon_x = (box.get_width () - window_icon_width) / 2;
+        var window_icon_y = box.get_height () - (window_icon_height * 0.75f);
+
+        var window_icon_alloc = InternalUtils.actor_box_from_rect (window_icon_x, window_icon_y, window_icon_width, window_icon_height);
+        window_icon.allocate (window_icon_alloc);
+
         var rect = get_transformed_extents ();
         var monitor_index = display.get_monitor_index_for_rect (Mtk.Rectangle.from_graphene_rect (rect, ROUND));
         var monitor_scale = display.get_monitor_scale (monitor_index);
@@ -351,19 +362,10 @@ public class Gala.WindowClone : Clutter.Actor {
         var window_title_width = window_title_nat_width.clamp (0, window_title_max_width);
 
         float window_title_x = (box.get_width () - window_title_width) / 2;
-        float window_title_y = box.get_height () - InternalUtils.scale_to_int (WINDOW_ICON_SIZE, monitor_scale) * 0.75f - (window_title_height / 2) - InternalUtils.scale_to_int (18, monitor_scale);
+        float window_title_y = (window_icon.visible ? window_icon_y : box.get_height ()) - (window_title_height / 2) - InternalUtils.scale_to_int (18, monitor_scale);
 
         var window_title_alloc = InternalUtils.actor_box_from_rect (window_title_x, window_title_y, window_title_width, window_title_height);
         window_title.allocate (window_title_alloc);
-
-        float window_icon_width, window_icon_height;
-        window_icon.get_preferred_size (null, null, out window_icon_width, out window_icon_height);
-
-        var window_icon_x = (box.get_width () - window_icon_width) / 2;
-        var window_icon_y = box.get_height () - (window_icon_height * 0.75f);
-
-        var window_icon_alloc = InternalUtils.actor_box_from_rect (window_icon_x, window_icon_y, window_icon_width, window_icon_height);
-        window_icon.allocate (window_icon_alloc);
     }
 
 #if HAS_MUTTER45