alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: shadow clipping & shadow corners (#153)

Browse source
This commit is contained in:
William McKinnon 2023-05-05 16:07:50 -04:00 committed by GitHub
parent 94a6340f9f
commit 6e53c04abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/desktop/render.c
View file

@ -675,8 +675,8 @@ void render_box_shadow(struct sway_output *output, pixman_region32_t *output_dam
struct wlr_box box; struct wlr_box box;
memcpy(&box, _box, sizeof(struct wlr_box)); memcpy(&box, _box, sizeof(struct wlr_box));
box.x -= output->lx * wlr_output->scale + blur_sigma; box.x -= blur_sigma;
box.y -= output->ly * wlr_output->scale + blur_sigma; box.y -= blur_sigma;
box.width += 2 * blur_sigma; box.width += 2 * blur_sigma;
box.height += 2 * blur_sigma; box.height += 2 * blur_sigma;
@ -875,15 +875,13 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
// render shadow // render shadow
if (con->shadow_enabled && config->shadow_blur_sigma > 0 && config->shadow_color[3] > 0.0) { if (con->shadow_enabled && config->shadow_blur_sigma > 0 && config->shadow_color[3] > 0.0) {
box.x = floor(state->x); box.x = floor(state->x) - output->lx;
box.y = floor(state->y); box.y = floor(state->y) - output->ly;
box.width = state->width; box.width = state->width;
box.height = state->height; box.height = state->height;
scale_box(&box, output_scale); scale_box(&box, output_scale);
int corner_radius = config->smart_corner_radius && int scaled_corner_radius = deco_data.corner_radius == 0 ?
output->current.active_workspace->current_gaps.top == 0 0 : (deco_data.corner_radius + state->border_thickness) * output_scale;
? 0 : con->corner_radius;
int scaled_corner_radius = (corner_radius + state->border_thickness) * output_scale;
render_box_shadow(output, damage, &box, config->shadow_color, config->shadow_blur_sigma, render_box_shadow(output, damage, &box, config->shadow_color, config->shadow_blur_sigma,
scaled_corner_radius); scaled_corner_radius);
} }