ModalGroup: Blur background (#2715)

Author: leolost2605

src/Widgets/ModalGroup.vala

@@ -10,29 +10,53 @@
  * the desktop behind them and only allow interaction with them.
  * Not to be confused with WindowManager.push_modal which only
  * works for our own Clutter.Actors.
+ * Note that windows shouldn't be added to this actor directly but
+ * instead to {@link window_group}.
  */
 public class Gala.ModalGroup : Clutter.Actor {
     public WindowManager wm { private get; construct; }
     public ShellClientsManager shell_clients { private get; construct; }
 
+    public Clutter.Actor window_group { get; construct; }
+
+    private Clutter.Actor background;
     private Gee.Set<Clutter.Actor> dimmed;
     private ModalProxy? modal_proxy = null;
 
     public ModalGroup (WindowManager wm, ShellClientsManager shell_clients) {
         Object (wm: wm, shell_clients: shell_clients);
     }
 
+    class construct {
+        set_layout_manager_type (typeof (Clutter.BinLayout));
+    }
+
     construct {
+        background = new Clutter.Actor () {
+            background_color = { 0, 0, 0, 125 },
+            x_expand = true,
+            y_expand = true,
+        };
+        background.add_effect (new BackgroundBlurEffect (10, 0, 1));
+
+        window_group = new Clutter.Actor () {
+            x_expand = true,
+            y_expand = true,
+        };
+
+        add_child (background);
+        add_child (window_group);
+
         dimmed = new Gee.HashSet<Clutter.Actor> ();
 
         visible = false;
         reactive = true;
 #if HAS_MUTTER46
-        child_added.connect (on_child_added);
-        child_removed.connect (on_child_removed);
+        window_group.child_added.connect (on_child_added);
+        window_group.child_removed.connect (on_child_removed);
 #else
-        actor_added.connect (on_child_added);
-        actor_removed.connect (on_child_removed);
+        window_group.actor_added.connect (on_child_added);
+        window_group.actor_removed.connect (on_child_removed);
 #endif
     }
 
@@ -41,36 +65,36 @@ public class Gala.ModalGroup : Clutter.Actor {
             dimmed.add (child);
         }
 
-        if (get_n_children () == 1) {
+        if (window_group.get_n_children () == 1) {
             assert (modal_proxy == null);
 
             visible = true;
             modal_proxy = wm.push_modal (this, false);
         }
 
         if (dimmed.size == 1) {
-            save_easing_state ();
-            set_easing_duration (Utils.get_animation_duration (AnimationDuration.OPEN));
-            background_color = { 0, 0, 0, 200 };
-            restore_easing_state ();
+            background.save_easing_state ();
+            background.set_easing_duration (Utils.get_animation_duration (AnimationDuration.OPEN));
+            background.opacity = 255u;
+            background.restore_easing_state ();
         }
     }
 
     private void on_child_removed (Clutter.Actor child) {
         dimmed.remove (child);
 
         if (dimmed.size == 0) {
-            save_easing_state ();
-            set_easing_duration (Utils.get_animation_duration (AnimationDuration.CLOSE));
-            background_color = { 0, 0, 0, 0 };
-            restore_easing_state ();
+            background.save_easing_state ();
+            background.set_easing_duration (Utils.get_animation_duration (AnimationDuration.CLOSE));
+            background.opacity = 0u;
+            background.restore_easing_state ();
         }
 
-        if (get_n_children () == 0) {
+        if (window_group.get_n_children () == 0) {
             wm.pop_modal (modal_proxy);
             modal_proxy = null;
 
-            var transition = get_transition ("background-color");
+            var transition = background.get_transition ("opacity");
             if (transition != null) {
                 transition.completed.connect (() => visible = false);
             } else {

src/WindowManager.vala

@@ -1028,7 +1028,7 @@ namespace Gala {
             unowned var window = actor.get_meta_window ();
 
             if (ShellClientsManager.get_instance ().is_system_modal_window (window)) {
-                InternalUtils.clutter_actor_reparent (actor, modal_group);
+                InternalUtils.clutter_actor_reparent (actor, modal_group.window_group);
                 return;
             }