Merge branch 'main' into leolost/window-list-model-full

Author: leolost2605

src/BackgroundBlurEffect.vala

@@ -224,10 +224,6 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
     }
 
     private bool update_actor_fbo (int width, int height, float downscale_factor) {
-        if (width <= 0 || height <= 0) {
-            return false;
-        }
-
         if (
             texture_width == width &&
             texture_height == height &&
@@ -344,7 +340,7 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
         var width = (int) actor_box.get_width ();
         var height = (int) actor_box.get_height ();
 
-        if (width < 0 || height < 0) {
+        if (width <= 0 || height <= 0) {
             warning ("BackgroundBlurEffect: Couldn't update framebuffers, incorrect size");
             return false;
         }

src/BlurManager.vala

@@ -32,13 +32,22 @@ public class Gala.BlurManager : Object {
 
     public WindowManagerGala wm { get; construct; }
 
+    private bool framebuffer_is_logical = false;
     private GLib.HashTable<Meta.Window, BlurData?> blurred_windows = new GLib.HashTable<Meta.Window, BlurData?> (null, null);
 
     private BlurManager (WindowManagerGala wm) {
         Object (wm: wm);
     }
 
     construct {
+        var experimental_features = new Settings ("org.gnome.mutter").get_strv ("experimental-features");
+        for (var i = 0; i < experimental_features.length; i++) {
+            if (experimental_features[i] == "scale-monitor-framebuffer") {
+                framebuffer_is_logical = true;
+                break;
+            }
+        }
+
         wm.get_display ().window_created.connect ((window) => {
             window.notify["mutter-hints"].connect ((obj, pspec) => parse_mutter_hints ((Meta.Window) obj));
             parse_mutter_hints (window);
@@ -74,8 +83,17 @@ public class Gala.BlurManager : Object {
         var x_shadow_size = frame_rect.x - buffer_rect.x;
         var y_shadow_size = frame_rect.y - buffer_rect.y;
 
-        blur_data.actor.set_position (x_shadow_size + left, y_shadow_size + top);
-        blur_data.actor.set_size (frame_rect.width - left - right, frame_rect.height - top - bottom);
+        var monitor_scale = framebuffer_is_logical ? 1.0f : window.display.get_monitor_scale (window.get_monitor ());
+        var inverse_monitor_scale = 1.0f / monitor_scale;
+
+        blur_data.actor.set_position (
+            Utils.scale_to_int (x_shadow_size, inverse_monitor_scale) + left,
+            Utils.scale_to_int (y_shadow_size, inverse_monitor_scale) + top
+        );
+        blur_data.actor.set_size (
+            Utils.scale_to_int (frame_rect.width, inverse_monitor_scale) - left - right,
+            Utils.scale_to_int (frame_rect.height, inverse_monitor_scale) - top - bottom
+        );
     }
 
     public void remove_blur (Meta.Window window) {

src/WindowManager.vala

@@ -1079,59 +1079,50 @@ namespace Gala {
                 return;
             }
 
-            var duration = AnimationDuration.HIDE;
-
             kill_window_effects (actor);
             minimizing.add (actor);
 
-            int width, height;
-            get_display ().get_size (out width, out height);
-
             Mtk.Rectangle icon = {};
             if (actor.get_meta_window ().get_icon_geometry (out icon)) {
                 // Fix icon position and size according to ui scaling factor.
-                float ui_scale = get_display ().get_monitor_scale (get_display ().get_monitor_index_for_rect (icon));
+                var ui_scale = get_display ().get_monitor_scale (get_display ().get_monitor_index_for_rect (icon));
                 icon.x = Utils.scale_to_int (icon.x, ui_scale);
                 icon.y = Utils.scale_to_int (icon.y, ui_scale);
                 icon.width = Utils.scale_to_int (icon.width, ui_scale);
                 icon.height = Utils.scale_to_int (icon.height, ui_scale);
 
-                float scale_x = (float)icon.width / actor.width;
-                float scale_y = (float)icon.height / actor.height;
-                float anchor_x = (float)(actor.x - icon.x) / (icon.width - actor.width);
-                float anchor_y = (float)(actor.y - icon.y) / (icon.height - actor.height);
-                actor.set_pivot_point (anchor_x, anchor_y);
+                actor.set_pivot_point (
+                    (actor.x - icon.x) / (icon.width - actor.width),
+                    (actor.y - icon.y) / (icon.height - actor.height)
+                );
 
                 actor.save_easing_state ();
                 actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_EXPO);
-                actor.set_easing_duration (duration);
-                actor.set_scale (scale_x, scale_y);
-                actor.opacity = 0U;
+                actor.set_easing_duration (AnimationDuration.HIDE);
+                actor.set_scale (icon.width / actor.width, icon.height / actor.height);
+                actor.opacity = 0;
                 actor.restore_easing_state ();
 
-                ulong minimize_handler_id = 0UL;
+                ulong minimize_handler_id = 0;
                 minimize_handler_id = actor.transitions_completed.connect (() => {
                     actor.disconnect (minimize_handler_id);
                     minimize_completed (actor);
                     minimizing.remove (actor);
                 });
-
             } else {
                 actor.set_pivot_point (0.5f, 1.0f);
 
                 actor.save_easing_state ();
                 actor.set_easing_mode (Clutter.AnimationMode.EASE_IN_EXPO);
-                actor.set_easing_duration (duration);
-                actor.set_scale (0.0f, 0.0f);
-                actor.opacity = 0U;
+                actor.set_easing_duration (AnimationDuration.HIDE);
+                actor.set_scale (0.0, 0.0);
+                actor.opacity = 0;
                 actor.restore_easing_state ();
 
-                ulong minimize_handler_id = 0UL;
+                ulong minimize_handler_id = 0;
                 minimize_handler_id = actor.transitions_completed.connect (() => {
                     actor.disconnect (minimize_handler_id);
                     actor.set_pivot_point (0.0f, 0.0f);
-                    actor.set_scale (1.0f, 1.0f);
-                    actor.opacity = 255U;
                     minimize_completed (actor);
                     minimizing.remove (actor);
                 });
@@ -1407,6 +1398,7 @@ namespace Gala {
             }
 
             if (!Meta.Prefs.get_gnome_animations ()) {
+                actor.opacity = 0;
                 destroy_completed (actor);
 
                 if (window.window_type == Meta.WindowType.NORMAL) {