Skip to content

ShadowEffect: fix scale #2381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025
Merged

ShadowEffect: fix scale #2381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/ShadowEffect.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ public class Gala.ShadowEffect : Clutter.Effect {
}
}

private Cogl.Texture? get_shadow (Cogl.Context context, int width, int height, int shadow_size) {
private Cogl.Texture? get_shadow (Cogl.Context context, int width, int height, int shadow_size, int border_radius) {
var old_key = current_key;
current_key = "%ix%i:%i".printf (width, height, shadow_size);
current_key = "%ix%i:%i:%i".printf (width, height, shadow_size, border_radius);
if (old_key == current_key) {
return null;
}
Expand Down Expand Up @@ -123,8 +123,7 @@ public class Gala.ShadowEffect : Clutter.Effect {

cr.save ();
cr.set_operator (Cairo.Operator.CLEAR);
var size = shadow_size * monitor_scale;
Drawing.Utilities.cairo_rounded_rectangle (cr, size, size, actor.width, actor.height, border_radius);
Drawing.Utilities.cairo_rounded_rectangle (cr, shadow_size, shadow_size, actor.width, actor.height, border_radius);
cr.fill ();
cr.restore ();

Expand All @@ -145,7 +144,7 @@ public class Gala.ShadowEffect : Clutter.Effect {
var width = (int) (bounding_box.x2 - bounding_box.x1);
var height = (int) (bounding_box.y2 - bounding_box.y1);

var shadow = get_shadow (context.get_framebuffer ().get_context (), width, height, shadow_size);
var shadow = get_shadow (context.get_framebuffer ().get_context (), width, height, Utils.scale_to_int (shadow_size, monitor_scale), Utils.scale_to_int (border_radius, monitor_scale));
if (shadow != null) {
pipeline.set_layer_texture (0, shadow);
}
Expand All @@ -162,9 +161,9 @@ public class Gala.ShadowEffect : Clutter.Effect {
}

private Clutter.ActorBox get_bounding_box () {
var size = shadow_size * monitor_scale;
var bounding_box = Clutter.ActorBox ();
var size = Utils.scale_to_int (shadow_size, monitor_scale);

var bounding_box = Clutter.ActorBox ();
bounding_box.set_origin (-size, -size);
bounding_box.set_size (actor.width + size * 2, actor.height + size * 2);

Expand Down
Loading