Merge branch 'main' into lenemter/bg-blur-2

Author: lenemter

data/gala.gschema.xml

@@ -205,7 +205,7 @@
     <key type="b" name="enable-animations">
       <default>true</default>
       <summary>Enable Animations</summary>
-      <description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
+      <description>DEPRECATED: This key is deprecated and ignored.</description>
     </key>
   </schema>
 

lib/AnimationsSettings.vala

@@ -325,9 +325,14 @@ namespace Gala {
                 return null;
             }
 
-            var container = new Clutter.Actor ();
-            container.set_size (inner_rect.width, inner_rect.height);
-            container.content = content;
+            var container = new Clutter.Actor () {
+                content = content,
+                offscreen_redirect = Clutter.OffscreenRedirect.ALWAYS,
+                x = inner_rect.x,
+                y = inner_rect.y,
+                width = inner_rect.width,
+                height = inner_rect.height
+            };
 
             return container;
         }
@@ -451,5 +456,12 @@ namespace Gala {
             regions.remove (window);
             X.Fixes.destroy_region (xdisplay, region);
         }
+
+        /**
+         * Utility that returns the given duration or 0 if animations are disabled.
+         */
+        public static uint get_animation_duration (uint duration) {
+            return Meta.Prefs.get_gnome_animations () ? duration : 0;
+        }
     }
 }

lib/Utils.vala

@@ -1,6 +1,5 @@
 gala_lib_sources = files(
     'ActivatableComponent.vala',
-    'AnimationsSettings.vala',
     'App.vala',
     'AppCache.vala',
     'AppSystem.vala',

lib/meson.build

@@ -137,15 +137,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         opacity = 0;
 
         save_easing_state ();
-        set_easing_duration (AnimationsSettings.get_animation_duration (200));
+        set_easing_duration (Utils.get_animation_duration (200));
         opacity = 255;
         restore_easing_state ();
     }
 
     public override void hide () {
         opacity = 255;
 
-        var duration = AnimationsSettings.get_animation_duration (200);
+        var duration = Utils.get_animation_duration (200);
         save_easing_state ();
         set_easing_duration (duration);
         opacity = 0;
@@ -167,7 +167,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool enter_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = AnimationsSettings.get_animation_duration (300);
+        var duration = Utils.get_animation_duration (300);
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -187,7 +187,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool leave_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = AnimationsSettings.get_animation_duration (300);
+        var duration = Utils.get_animation_duration (300);
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -309,7 +309,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void on_close_click_clicked () {
-        var duration = AnimationsSettings.get_animation_duration (FADE_OUT_TIMEOUT);
+        var duration = Utils.get_animation_duration (FADE_OUT_TIMEOUT);
 
         save_easing_state ();
         set_easing_duration (duration);
@@ -433,7 +433,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         var screen_limit_start_y = workarea_rect.y + SCREEN_MARGIN;
         var screen_limit_end_y = workarea_rect.y + workarea_rect.height - SCREEN_MARGIN - height;
 
-        var duration = AnimationsSettings.get_animation_duration (300);
+        var duration = Utils.get_animation_duration (300);
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@@ -446,7 +446,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private bool place_window_off_screen () {
         off_screen = false;
 
-        var duration = AnimationsSettings.get_animation_duration (300);
+        var duration = Utils.get_animation_duration (300);
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);

plugins/pip/PopupWindow.vala

@@ -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-03-02 14:11+0000\n"
-"PO-Revision-Date: 2025-02-16 03:16+0000\n"
+"PO-Revision-Date: 2025-03-08 12:45+0000\n"
 "Last-Translator: David Hewitt <[email protected]>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "desktop/gala/en_GB/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.10.2\n"
 "X-Launchpad-Export-Date: 2017-03-14 07:02+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -293,7 +293,7 @@ msgstr "Screenshot from %s"
 #. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
 #: src/WindowManager.vala:2373
 msgid "Show in Files"
-msgstr ""
+msgstr "Show in Files"
 
 #: src/WindowManager.vala:2380
 msgid "Screenshot is saved to clipboard"

po/en_GB.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-02 14:11+0000\n"
-"PO-Revision-Date: 2024-12-21 09:16+0000\n"
+"PO-Revision-Date: 2025-03-08 12:45+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.elementary.io/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.8.4\n"
+"X-Generator: Weblate 5.10.2\n"
 "X-Launchpad-Export-Date: 2017-04-20 06:29+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -301,15 +301,15 @@ msgstr "Zrzut ekranu z %s"
 #. / TRANSLATORS: 'Files' is the name of file manager used by elementary OS
 #: src/WindowManager.vala:2373
 msgid "Show in Files"
-msgstr ""
+msgstr "Pokaż w Plikach"
 
 #: src/WindowManager.vala:2380
 msgid "Screenshot is saved to clipboard"
-msgstr ""
+msgstr "Zrzut ekranu zapisany do schowka"
 
 #: src/WindowManager.vala:2380
 msgid "Screenshot saved to screenshots folder"
-msgstr ""
+msgstr "Zrzut ekranu zapisany do folderu ze zrzutami ekranu"
 
 #~ msgid ""
 #~ "Set the keyboard layout correctly at startup so that the indicator "

po/pl.po

@@ -61,7 +61,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
             return;
         }
 
-        if (animate && AnimationsSettings.get_enable_animations ()) {
+        if (animate && Meta.Prefs.get_gnome_animations ()) {
             var transition = new Clutter.PropertyTransition ("opacity");
             transition.set_from_value (255);
             transition.set_to_value (0);

src/Background/BackgroundManager.vala

@@ -41,6 +41,7 @@ namespace Gala {
         SWITCH_WINDOWS,
         MULTITASKING_VIEW,
         DOCK,
+        ZOOM,
         N_ACTIONS
     }
 

src/Gestures/Gesture.vala

@@ -47,6 +47,12 @@ public class Gala.GestureController : Object {
     public double overshoot_lower_clamp { get; construct set; default = 0d; }
     public double overshoot_upper_clamp { get; construct set; default = 1d; }
 
+    /**
+     * When disabled gesture progress will stay where the gesture ended and not snap to full integers values.
+     * This will also cause the controller to emit smooth progress information even if animations are disabled.
+     */
+    public bool snap { get; construct set; default = true; }
+
     private double _progress = 0;
     public double progress {
         get { return _progress; }
@@ -129,13 +135,13 @@ public class Gala.GestureController : Object {
             || backend == scroll_backend && GestureSettings.get_action (gesture) == NONE);
 
         if (recognizing) {
-            if (gesture.direction == UP || gesture.direction == RIGHT) {
+            if (gesture.direction == UP || gesture.direction == RIGHT || gesture.direction == OUT) {
                 direction_multiplier = 1;
             } else {
                 direction_multiplier = -1;
             }
 
-            if (!AnimationsSettings.get_enable_animations ()) {
+            if (snap && !Meta.Prefs.get_gnome_animations ()) {
                 prepare ();
                 finish (0, progress + direction_multiplier);
                 recognizing = false;
@@ -188,17 +194,21 @@ public class Gala.GestureController : Object {
             return;
         }
 
+        recognizing = false;
+
         progress += calculate_applied_delta (percentage, previous_delta);
 
         var to = progress;
 
-        if (velocity.abs () > SUCCESS_VELOCITY_THRESHOLD) {
-            to += (velocity > 0 ? direction_multiplier : -direction_multiplier) * 0.5;
-        }
+        if (snap) {
+            if (velocity.abs () > SUCCESS_VELOCITY_THRESHOLD) {
+                to += (velocity > 0 ? direction_multiplier : -direction_multiplier) * 0.5;
+            }
 
-        recognizing = false;
+            to = Math.round (to);
+        }
 
-        finish (velocity, Math.round (to));
+        finish (velocity, to);
 
         previous_percentage = 0;
         previous_time = 0;
@@ -221,7 +231,7 @@ public class Gala.GestureController : Object {
             return;
         }
 
-        if (!AnimationsSettings.get_enable_animations ()) {
+        if (!Meta.Prefs.get_gnome_animations ()) {
             progress = clamped_to;
             target.propagate (END, action, calculate_bounded_progress ());
             return;