diff --git a/src/Background/BackgroundManager.vala b/src/Background/BackgroundManager.vala index 14e7ec3fc..f51f82601 100644 --- a/src/Background/BackgroundManager.vala +++ b/src/Background/BackgroundManager.vala @@ -13,6 +13,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag public WindowManager wm { get; construct; } public int monitor_index { get; construct; } public bool control_position { get; construct; } + public bool rounded_corners { get; construct; } public Meta.BackgroundActor newest_background_actor { get { return (new_background_actor != null) ? new_background_actor : background_actor; @@ -23,8 +24,8 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag private Meta.BackgroundActor? background_actor; private Meta.BackgroundActor? new_background_actor = null; - public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true) { - Object (wm: wm, monitor_index: monitor_index, control_position: control_position); + public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true, bool rounded_corners = true) { + Object (wm: wm, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners); } construct { @@ -91,7 +92,10 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag var background = new_content.background.get_data ("delegate"); if (background.is_loaded) { - new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index)); + if (rounded_corners) { + new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index)); + } + swap_background_actor (animate); return; } @@ -101,8 +105,11 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag background.disconnect (handler); background.set_data ("background-loaded-handler", 0); + if (rounded_corners) { + new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index)); + } + swap_background_actor (animate); - new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index)); }); background.set_data ("background-loaded-handler", handler); } diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala index 5be273c8a..02f7ac15a 100644 --- a/src/Widgets/MultitaskingView.vala +++ b/src/Widgets/MultitaskingView.vala @@ -86,7 +86,7 @@ namespace Gala { brightness_effect = new Clutter.BrightnessContrastEffect (); update_brightness_effect (); - var blurred_bg = new BackgroundManager (wm, display.get_primary_monitor ()); + var blurred_bg = new BackgroundManager (wm, display.get_primary_monitor (), true, false); blurred_bg.add_effect (new BlurEffect (blurred_bg, 18)); blurred_bg.add_effect (brightness_effect); diff --git a/src/Widgets/WorkspaceClone.vala b/src/Widgets/WorkspaceClone.vala index 8c5a716a9..2dfe0c991 100644 --- a/src/Widgets/WorkspaceClone.vala +++ b/src/Widgets/WorkspaceClone.vala @@ -31,7 +31,8 @@ namespace Gala { Object ( wm: wm, monitor_index: wm.get_display ().get_primary_monitor (), - control_position: false + control_position: false, + rounded_corners: true ); }