Merge branch 'main' into lenemter/check-for-redacted-font

Author: lenemter

po/POTFILES

@@ -90,8 +90,8 @@ src/Widgets/MultitaskingView/WorkspaceInsertThumb.vala
 src/Widgets/MultitaskingView/WorkspaceRow.vala
 src/Widgets/PixelPicker.vala
 src/Widgets/PointerLocator.vala
-src/Widgets/ScreenShield.vala
 src/Widgets/SelectionArea.vala
+src/Widgets/SessionLocker.vala
 src/Widgets/WindowOverview.vala
 src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala
 src/Widgets/WindowSwitcher/WindowSwitcher.vala

po/ja.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: noise\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-03-24 21:59+0000\n"
-"PO-Revision-Date: 2025-03-03 20:18+0000\n"
+"PO-Revision-Date: 2025-03-28 19:55+0000\n"
 "Last-Translator: Ryo Nakano <[email protected]>\n"
-"Language-Team: Japanese <https://l10n.elementary.io/projects/desktop/gala/ja/"
-">\n"
+"Language-Team: Japanese <https://l10n.elementaryos.org/projects/desktop/gala/"
+"ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.10.4\n"
 "X-Launchpad-Export-Date: 2017-03-02 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,7 +127,7 @@ msgstr "翻訳の更新"
 
 #: data/gala.metainfo.xml.in:35
 msgid "Window state is now saved on sleep and shutdown"
-msgstr ""
+msgstr "スリープ・シャットダウン時にウィンドウの状態を保持するように修正"
 
 #: data/gala.metainfo.xml.in:58
 msgid "Fixed rare crash when a dock window was killed"

po/pl.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: gala\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-03-24 21:59+0000\n"
-"PO-Revision-Date: 2025-03-08 12:45+0000\n"
+"PO-Revision-Date: 2025-03-30 11:55+0000\n"
 "Last-Translator: Marcin Serwin <[email protected]>\n"
-"Language-Team: Polish <https://l10n.elementary.io/projects/desktop/gala/pl/"
-">\n"
+"Language-Team: Polish <https://l10n.elementaryos.org/projects/desktop/gala/"
+"pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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.2\n"
+"X-Generator: Weblate 5.10.4\n"
 "X-Launchpad-Export-Date: 2017-04-20 06:29+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,7 +127,7 @@ msgstr "Zaktualizowano tłumaczenia"
 
 #: data/gala.metainfo.xml.in:35
 msgid "Window state is now saved on sleep and shutdown"
-msgstr ""
+msgstr "Stan okna jest teraz zapisywany przy usypianiu i wyłączaniu"
 
 #: data/gala.metainfo.xml.in:58
 msgid "Fixed rare crash when a dock window was killed"

po/uk.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: beat-box\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2025-03-24 21:59+0000\n"
-"PO-Revision-Date: 2025-03-03 20:18+0000\n"
+"PO-Revision-Date: 2025-03-28 19:55+0000\n"
 "Last-Translator: Ihor Hordiichuk <[email protected]>\n"
-"Language-Team: Ukrainian <https://l10n.elementary.io/projects/desktop/gala/"
-"uk/>\n"
+"Language-Team: Ukrainian <https://l10n.elementaryos.org/projects/desktop/"
+"gala/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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.9.2\n"
+"X-Generator: Weblate 5.10.4\n"
 "X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -127,7 +127,7 @@ msgstr "Оновлені переклади"
 
 #: data/gala.metainfo.xml.in:35
 msgid "Window state is now saved on sleep and shutdown"
-msgstr ""
+msgstr "Стан вікна тепер зберігається під час засинання та вимкнення"
 
 #: data/gala.metainfo.xml.in:58
 msgid "Fixed rare crash when a dock window was killed"

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -356,7 +356,6 @@ public class Gala.MultitaskingView : ActorTarget, ActivatableComponent {
         icon_groups.add_group (workspace.icon_group);
 
         workspace.window_selected.connect (window_selected);
-        workspace.selected.connect (activate_workspace);
 
         reposition_icon_groups (false);
     }
@@ -384,7 +383,6 @@ public class Gala.MultitaskingView : ActorTarget, ActivatableComponent {
         }
 
         workspace.window_selected.disconnect (window_selected);
-        workspace.selected.disconnect (activate_workspace);
 
         if (icon_groups.contains (workspace.icon_group)) {
             icon_groups.remove_group (workspace.icon_group);
@@ -412,25 +410,6 @@ public class Gala.MultitaskingView : ActorTarget, ActivatableComponent {
         }
     }
 
-    /**
-     * Activates the workspace of a WorkspaceClone
-     *
-     * @param close_view Whether to close the view as well. Will only be considered
-     *                   if the workspace is also the currently active workspace.
-     *                   Otherwise it will only be made active, but the view won't be
-     *                   closed.
-     */
-    private void activate_workspace (WorkspaceClone clone, bool close_view) {
-        unowned Meta.WorkspaceManager manager = display.get_workspace_manager ();
-        close_view = close_view && manager.get_active_workspace () == clone.workspace;
-
-        clone.workspace.activate (display.get_current_time ());
-
-        if (close_view) {
-            close ();
-        }
-    }
-
     /**
      * Collect key events, mainly for redirecting them to the WindowCloneContainers to
      * select the active window.

src/Widgets/MultitaskingView/WindowClone.vala

@@ -140,7 +140,6 @@ public class Gala.WindowClone : ActorTarget {
         };
 
         window_title = new Tooltip ();
-        window_title.opacity = 0;
 
         add_child (active_shape);
         add_child (clone_container);
@@ -168,6 +167,7 @@ public class Gala.WindowClone : ActorTarget {
             opacity = 0
         };
         close_button.triggered.connect (close_window);
+        close_button.notify["has-pointer"].connect (() => update_hover_widgets ());
 
         window_icon = new WindowIcon (window, WINDOW_ICON_SIZE, (int)Math.round (monitor_scale_factor)) {
             visible = !overview_mode
@@ -257,17 +257,16 @@ public class Gala.WindowClone : ActorTarget {
 
         add_target (new PropertyTarget (MULTITASKING_VIEW, this, "x", typeof (float), (float) window_rect.x, (float) slot.x));
         add_target (new PropertyTarget (MULTITASKING_VIEW, this, "y", typeof (float), (float) window_rect.y, (float) slot.y));
-
         add_target (new PropertyTarget (MULTITASKING_VIEW, this, "width", typeof (float), (float) window_rect.width, (float) slot.width));
         add_target (new PropertyTarget (MULTITASKING_VIEW, this, "height", typeof (float), (float) window_rect.height, (float) slot.height));
-
+        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "shadow-opacity", typeof (uint8), (uint8) 0u, (uint8) 255u));
         if (should_fade ()) {
             add_target (new PropertyTarget (MULTITASKING_VIEW, this, "opacity", typeof (uint8), (uint8) 0u, (uint8) 255u));
         }
 
         add_target (new PropertyTarget (MULTITASKING_VIEW, window_icon, "opacity", typeof (uint), 0u, 255u));
 
-        add_target (new PropertyTarget (MULTITASKING_VIEW, this, "shadow-opacity", typeof (uint8), (uint8) 0u, (uint8) 255u));
+        add_target (new PropertyTarget (MULTITASKING_VIEW, window_title, "opacity", typeof (uint), 0u, 255u));
     }
 
     public override void start_progress (GestureAction action) {
@@ -386,19 +385,13 @@ public class Gala.WindowClone : ActorTarget {
 
         var duration = Utils.get_animation_duration (FADE_ANIMATION_DURATION);
 
-        var show = has_pointer && !in_slot_animation;
+        var show = (has_pointer || close_button.has_pointer) && !in_slot_animation;
 
         close_button.save_easing_state ();
         close_button.set_easing_mode (Clutter.AnimationMode.LINEAR);
         close_button.set_easing_duration (duration);
         close_button.opacity = show ? 255 : 0;
         close_button.restore_easing_state ();
-
-        window_title.save_easing_state ();
-        window_title.set_easing_mode (Clutter.AnimationMode.LINEAR);
-        window_title.set_easing_duration (duration);
-        window_title.opacity = show ? 255 : 0;
-        window_title.restore_easing_state ();
     }
 
     /**

src/Widgets/MultitaskingView/WorkspaceClone.vala

@@ -126,14 +126,6 @@ public class Gala.WorkspaceClone : ActorTarget {
      */
     public signal void window_selected (Meta.Window window);
 
-    /**
-     * The background has been selected. Switch to that workspace.
-     *
-     * @param close_view If the MultitaskingView should also consider closing itself
-     *                   after switching.
-     */
-    public signal void selected (bool close_view);
-
     public WindowManager wm { get; construct; }
     public Meta.Workspace workspace { get; construct; }
     public IconGroup icon_group { get; private set; }
@@ -170,9 +162,7 @@ public class Gala.WorkspaceClone : ActorTarget {
         var monitor_geometry = display.get_monitor_geometry (primary_monitor);
 
         var background_click_action = new Clutter.ClickAction ();
-        background_click_action.clicked.connect (() => {
-            selected (true);
-        });
+        background_click_action.clicked.connect (() => activate (true));
         background = new FramedBackground (display);
         background.add_action (background_click_action);
 
@@ -181,10 +171,10 @@ public class Gala.WorkspaceClone : ActorTarget {
             height = monitor_geometry.height,
         };
         window_container.window_selected.connect ((w) => { window_selected (w); });
-        window_container.requested_close.connect (() => selected (true));
+        window_container.requested_close.connect (() => activate (true));
 
         icon_group = new IconGroup (display, workspace, scale_factor);
-        icon_group.selected.connect (() => selected (true));
+        icon_group.selected.connect (() => activate (true));
 
         var icons_drop_action = new DragDropAction (DragDropActionType.DESTINATION, "multitaskingview-window");
         icon_group.add_action (icons_drop_action);
@@ -200,7 +190,7 @@ public class Gala.WorkspaceClone : ActorTarget {
 
             if (hovered && hover_activate_timeout == 0) {
                 hover_activate_timeout = Timeout.add (HOVER_ACTIVATE_DELAY, () => {
-                    selected (false);
+                    activate (false);
                     hover_activate_timeout = 0;
                     return false;
                 });
@@ -333,4 +323,12 @@ public class Gala.WorkspaceClone : ActorTarget {
             icon_group.backdrop_opacity = 1 - (float) (workspace.index () + progress).abs ().clamp (0, 1);
         }
     }
+
+    private void activate (bool close_view) {
+        if (close_view && workspace.active) {
+            wm.perform_action (SHOW_MULTITASKING_VIEW);
+        } else {
+            workspace.activate (Meta.CURRENT_TIME);
+        }
+    }
 }

src/WindowManager.vala

@@ -1350,16 +1350,12 @@ namespace Gala {
 
                     mapping.add (actor);
 
-                    actor.set_pivot_point (0.5f, 0.5f);
-                    actor.set_pivot_point_z (0.2f);
-                    actor.set_scale (0.9f, 0.9f);
                     actor.opacity = 0;
 
                     actor.save_easing_state ();
                     actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
                     actor.set_easing_duration (duration);
-                    actor.set_scale (1.0f, 1.0f);
-                    actor.opacity = 255U;
+                    actor.opacity = 255;
                     actor.restore_easing_state ();
 
                     ulong map_handler_id = 0UL;