Merge branch 'main' into leolost/window-positioner

Author: lenemter

data/gala.metainfo.xml.in

@@ -27,14 +27,15 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="8.0.2" date="2024-10-15" urgency="medium">
+    <release version="8.0.2" date="2024-10-24" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
           <li>Updated translations</li>
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/gala/issues/1737">Cursor only visible in window screenshots </issue>
         <issue url="https://github.com/elementary/gala/issues/1898">wayland: opening windows when overview is opened breaks a lot</issue>
         <issue url="https://github.com/elementary/gala/issues/2053">Window renders black</issue>
         <issue url="https://github.com/elementary/gala/issues/2067">Terminal and System Settings have generic icon in multitasking view on Wayland</issue>

lib/AnimationsSettings.vala

@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2024 elementary, Inc. (https://elementary.io)
+ */
+
+namespace AnimationsSettings {
+    private GLib.Settings? animations_settings;
+    private bool enable_animations = true;
+
+    /**
+     * Whether animations should be displayed.
+     */
+    public bool get_enable_animations () {
+        if (animations_settings == null) {
+            animations_settings = new GLib.Settings ("io.elementary.desktop.wm.animations");
+            animations_settings.changed["enable-animations"].connect (() => {
+                enable_animations = animations_settings.get_boolean ("enable-animations");
+            });
+
+            enable_animations = animations_settings.get_boolean ("enable-animations");
+        }
+
+        return enable_animations;
+    }
+}

lib/DragDropAction.vala

@@ -229,7 +229,7 @@ namespace Gala {
 
                         // release has happened within bounds of actor
                         if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
-                            actor_clicked (event.get_button ());
+                            actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
                         }
 
                         if (clicked) {

lib/WindowManager.vala

@@ -123,11 +123,6 @@ namespace Gala {
          */
         public abstract Gala.ActivatableComponent workspace_view { get; protected set; }
 
-        /**
-         * Whether animations should be displayed.
-         */
-        public abstract bool enable_animations { get; protected set; }
-
         /**
          * Enters the modal mode, which means that all events are directed to the stage instead
          * of the windows. This is the only way to receive keyboard events besides shortcut listeners.

lib/meson.build

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

meson.build

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

plugins/pip/PopupWindow.vala

@@ -143,15 +143,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         opacity = 0;
 
         save_easing_state ();
-        set_easing_duration (wm.enable_animations ? 200 : 0);
+        set_easing_duration (AnimationsSettings.get_enable_animations () ? 200 : 0);
         opacity = 255;
         restore_easing_state ();
     }
 
     public override void hide () {
         opacity = 255;
 
-        var duration = wm.enable_animations ? 200 : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? 200 : 0;
         save_easing_state ();
         set_easing_duration (duration);
         opacity = 0;
@@ -173,7 +173,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool enter_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = wm.enable_animations ? 300 : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -193,7 +193,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     public override bool leave_event (Clutter.CrossingEvent event) {
 #endif
-        var duration = wm.enable_animations ? 300 : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
 
         close_button.save_easing_state ();
         close_button.set_easing_duration (duration);
@@ -315,7 +315,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void on_close_click_clicked () {
-        var duration = wm.enable_animations ? FADE_OUT_TIMEOUT : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? FADE_OUT_TIMEOUT : 0;
 
         save_easing_state ();
         set_easing_duration (duration);
@@ -449,7 +449,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         var screen_limit_start_y = SCREEN_MARGIN + monitor_y;
         var screen_limit_end_y = monitor_height + monitor_y - SCREEN_MARGIN - height;
 
-        var duration = wm.enable_animations ? 300 : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@@ -462,7 +462,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private bool place_window_off_screen () {
         off_screen = false;
 
-        var duration = wm.enable_animations ? 300 : 0;
+        var duration = AnimationsSettings.get_enable_animations () ? 300 : 0;
 
         save_easing_state ();
         set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);

po/pt_BR.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: beat-box\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-10-15 19:33+0000\n"
-"PO-Revision-Date: 2024-09-02 00:57+0000\n"
-"Last-Translator: José Rafael <jrafaeldesantana@gmail.com>\n"
+"PO-Revision-Date: 2024-10-26 22:46+0000\n"
+"Last-Translator: Diogo Pessoa <diogopessoabr@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://l10n.elementary.io/projects/"
 "desktop/gala/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -121,16 +121,12 @@ msgid "Updated translations"
 msgstr "Traduções atualizadas"
 
 #: data/gala.metainfo.xml.in:49
-#, fuzzy
-#| msgid "Fix potential crash when taking screenshots"
 msgid "Fix a potential crash when moving windows between workspaces"
-msgstr "Corrigir possíveis falhas ao capturar telas"
+msgstr "Corrige uma potencial falha ao mover janelas entre espaços de trabalho"
 
 #: data/gala.metainfo.xml.in:50
-#, fuzzy
-#| msgid "Fix notification position after changing DPI"
 msgid "Fix notification animation when entering multitasking view"
-msgstr "Corrigir a posição das notificações depois de modificar o DPI"
+msgstr "Corrige animação de notificação ao entrar na visão multitarefa"
 
 #: data/gala.metainfo.xml.in:65
 msgid "Improve keyboard navigation in Multitasking View"

src/Background/BackgroundManager.vala

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

src/NotificationStack.vala

@@ -48,7 +48,7 @@ public class Gala.NotificationStack : Object {
         update_stack_allocation ();
     }
 
-    public void show_notification (Meta.WindowActor notification, bool animate)
+    public void show_notification (Meta.WindowActor notification)
         requires (notification != null && !notification.is_destroyed () && !notifications.contains (notification)) {
 
         notification.set_pivot_point (0.5f, 0.5f);
@@ -62,7 +62,7 @@ public class Gala.NotificationStack : Object {
         var window_rect = window.get_frame_rect ();
         window.stick ();
 
-        if (animate) {
+        if (AnimationsSettings.get_enable_animations ()) {
             // Don't flicker at the beginning of the animation
             notification.opacity = 0;
             notification.rotation_angle_x = 90;
@@ -96,7 +96,7 @@ public class Gala.NotificationStack : Object {
          * by shifting all current notifications by height
          * and then add it to the notifications list.
          */
-        update_positions (animate, scale, window_rect.height);
+        update_positions (scale, window_rect.height);
 
         int notification_x_pos = area.x + area.width - window_rect.width;
         if (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL) {
@@ -117,7 +117,7 @@ public class Gala.NotificationStack : Object {
         stack_y = area.y;
     }
 
-    private void update_positions (bool animate, float scale, float add_y = 0.0f) {
+    private void update_positions (float scale, float add_y = 0.0f) {
         var y = stack_y + TOP_OFFSET + add_y + InternalUtils.scale_to_int (ADDITIONAL_MARGIN, scale);
         var i = notifications.size;
         var delay_step = i > 0 ? 150 / i : 0;
@@ -131,7 +131,7 @@ public class Gala.NotificationStack : Object {
                 continue;
             }
 
-            if (animate) {
+            if (AnimationsSettings.get_enable_animations ()) {
                 actor.save_easing_state ();
                 actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
                 actor.set_easing_duration (200);
@@ -140,7 +140,7 @@ public class Gala.NotificationStack : Object {
 
             move_window (actor, -1, (int)y);
 
-            if (animate) {
+            if (AnimationsSettings.get_enable_animations ()) {
                 actor.restore_easing_state ();
             }
 
@@ -160,8 +160,8 @@ public class Gala.NotificationStack : Object {
         }
     }
 
-    public void destroy_notification (Meta.WindowActor notification, bool animate) {
-        if (animate) {
+    public void destroy_notification (Meta.WindowActor notification) {
+        if (AnimationsSettings.get_enable_animations ()) {
             notification.save_easing_state ();
             notification.set_easing_duration (100);
             notification.set_easing_mode (Clutter.AnimationMode.EASE_IN_QUAD);
@@ -178,7 +178,7 @@ public class Gala.NotificationStack : Object {
         var scale = display.get_monitor_scale (primary);
 
         notifications.remove (notification);
-        update_positions (animate, scale);
+        update_positions (scale);
     }
 
     /**