Skip to content

Commit f26e6f0

Browse files
committed
Require border_radius
1 parent 452e5ce commit f26e6f0

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

lib/ShadowEffect.vala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ public class Gala.ShadowEffect : Clutter.Effect {
5151
}
5252

5353
public float monitor_scale { get; construct set; }
54+
public int border_radius { get; construct; }
5455

5556
public uint8 shadow_opacity { get; set; default = 255; }
56-
public int border_radius { get; set; default = 9;}
5757

5858
private int shadow_size;
5959
private Cogl.Pipeline? pipeline;
6060
private string? current_key = null;
6161

62-
public ShadowEffect (string css_class, float monitor_scale) {
63-
Object (css_class: css_class, monitor_scale: monitor_scale);
62+
public ShadowEffect (string css_class, int border_radius, float monitor_scale) {
63+
Object (css_class: css_class, border_radius: border_radius, monitor_scale: monitor_scale);
6464
}
6565

6666
~ShadowEffect () {

plugins/pip/PopupWindow.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
7878
reactive = true
7979
};
8080
container.add_child (clone_container);
81-
container.add_effect (new ShadowEffect ("window", scale));
81+
container.add_effect (new ShadowEffect ("window", 9, scale));
8282

8383
move_action = new DragDropAction (DragDropActionType.SOURCE, "pip");
8484
move_action.drag_begin.connect (on_move_begin);

src/Widgets/MultitaskingView/IconGroup.vala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,7 @@ public class Gala.IconGroup : CanvasActor {
235235
InternalUtils.scale_to_int (5, scale_factor)
236236
);
237237

238-
var shadow_effect = new ShadowEffect ("", scale_factor) {
239-
border_radius = InternalUtils.scale_to_int (5, scale_factor)
240-
};
238+
var shadow_effect = new ShadowEffect ("", InternalUtils.scale_to_int (5, scale_factor), scale_factor);
241239

242240
var style_manager = Drawing.StyleManager.get_instance ();
243241

src/Widgets/MultitaskingView/WindowClone.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public class Gala.WindowClone : ActorTarget {
206206

207207
if (window.fullscreen || window.maximized_horizontally && window.maximized_vertically) {
208208
if (shadow_effect == null) {
209-
shadow_effect = new ShadowEffect ("window", monitor_scale_factor);
209+
shadow_effect = new ShadowEffect ("window", 9, monitor_scale_factor);
210210
shadow_opacity = 0;
211211
clone.add_effect_with_name ("shadow", shadow_effect);
212212
}

src/Widgets/MultitaskingView/WorkspaceClone.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private class Gala.FramedBackground : BackgroundManager {
4343
#endif
4444
pipeline = new Cogl.Pipeline (ctx);
4545

46-
add_effect (new ShadowEffect ("workspace", display.get_monitor_scale (display.get_primary_monitor ())));
46+
add_effect (new ShadowEffect ("workspace", 9, display.get_monitor_scale (display.get_primary_monitor ())));
4747

4848
reactive = true;
4949
}

src/Widgets/WindowSwitcher/WindowSwitcher.vala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
9999
orientation = VERTICAL
100100
};
101101

102-
shadow_effect = new ShadowEffect ("window-switcher", scaling_factor) {
103-
border_radius = InternalUtils.scale_to_int (9, scaling_factor),
102+
shadow_effect = new ShadowEffect ("window-switcher", InternalUtils.scale_to_int (9, scaling_factor), scaling_factor) {
104103
shadow_opacity = 100
105104
};
106105
add_effect (shadow_effect);

0 commit comments

Comments
 (0)