Don't scale BackgroundBlurEffect

Author: lenemter

src/BackgroundBlurEffect.vala

@@ -4,10 +4,6 @@
  */
 
 public class Gala.BackgroundBlurEffect : Clutter.Effect {
-    /**
-     * Our rounded corners effect is antialiased, so we need to add a small offset to have proper corners
-     */
-    private const int CLIP_RADIUS_OFFSET = 2;
     private const float MIN_DOWNSCALE_SIZE = 256.0f;
     private const float MAX_RADIUS = 12.0f;
     private const int FORCE_REFRESH_FRAMES = 2;
@@ -72,8 +68,8 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
                 uniform float clip_radius;
 
                 float rounded_rect_coverage (vec2 p) {
-                    float center_left = clip_radius + 1.5;
-                    float center_right = actor_size.x - clip_radius - 0.55;
+                    float center_left = clip_radius;
+                    float center_right = actor_size.x - clip_radius;
 
                     float center_x;
                     if (p.x < center_left) {
@@ -84,8 +80,8 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
                         return 1.0;
                     }
 
-                    float center_top = clip_radius + 1.5;
-                    float center_bottom = actor_size.y - clip_radius - 0.55;
+                    float center_top = clip_radius;
+                    float center_bottom = actor_size.y - clip_radius;
 
                     float center_y;
                     if (p.y < center_top) {
@@ -111,7 +107,7 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
                         return 1.0;
                     }
                     // Only pixels on the edge of the curve need expensive antialiasing
-                    return outer_radius - sqrt (dist_squared);
+                    return smoothstep (outer_radius, inner_radius, sqrt (dist_squared));
                 }
                 """,
 
@@ -149,7 +145,7 @@ public class Gala.BackgroundBlurEffect : Clutter.Effect {
     }
 
     private void update_clip_radius () {
-        float[] _clip_radius = { clip_radius * monitor_scale + CLIP_RADIUS_OFFSET };
+        float[] _clip_radius = { clip_radius * monitor_scale };
         round_pipeline.set_uniform_float (round_clip_radius_location, 1, 1, _clip_radius);
     }
 

src/BlurManager.vala

@@ -43,9 +43,6 @@ public class Gala.BlurManager : Object {
             window.notify["mutter-hints"].connect ((obj, pspec) => parse_mutter_hints ((Meta.Window) obj));
             parse_mutter_hints (window);
         });
-
-        unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
-        monitor_manager.monitors_changed.connect (update_monitors);
     }
 
     /**
@@ -58,11 +55,9 @@ public class Gala.BlurManager : Object {
             return;
         }
 
-        var monitor_scaling_factor = wm.get_display ().get_monitor_scale (window.get_monitor ());
-
         var blur_data = blurred_windows[window];
         if (blur_data == null) {
-            var blur_effect = new BackgroundBlurEffect (BLUR_RADIUS, clip_radius, monitor_scaling_factor);
+            var blur_effect = new BackgroundBlurEffect (BLUR_RADIUS, (int) clip_radius, 1.0f);
 
             var blurred_actor = new Clutter.Actor ();
             blurred_actor.add_effect (blur_effect);
@@ -76,12 +71,11 @@ public class Gala.BlurManager : Object {
 
         var buffer_rect = window.get_buffer_rect ();
         var frame_rect = window.get_frame_rect ();
-        var x_shadow_size = (frame_rect.x - buffer_rect.x) / monitor_scaling_factor;
-        var y_shadow_size = (frame_rect.y - buffer_rect.y) / monitor_scaling_factor;
+        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);
-        blur_data.blur_effect.monitor_scale = monitor_scaling_factor;
     }
 
     public void remove_blur (Meta.Window window) {
@@ -110,15 +104,6 @@ public class Gala.BlurManager : Object {
         add_blur (window, blur_data.left, blur_data.right, blur_data.top, blur_data.bottom, blur_data.clip_radius);
     }
 
-    private void update_monitors () {
-        foreach (unowned var window in blurred_windows.get_keys ()) {
-            var blur_data = blurred_windows[window];
-
-            var monitor_scaling_factor = window.display.get_monitor_scale (window.get_monitor ());
-            blur_data.blur_effect.monitor_scale = monitor_scaling_factor;
-        }
-    }
-
     //X11 only
     private void parse_mutter_hints (Meta.Window window) {
         if (window.mutter_hints == null) {