mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: fix titlebar texture clipping

Browse source 
We need to provide an unclipped dst_box.

Fixes: https://github.com/swaywm/sway/issues/7573
Regressed by: https://github.com/swaywm/sway/pull/7552
This commit is contained in:
Simon Ser 2023-05-09 16:39:48 +02:00 committed by Kenny Levinsen
parent 0a951517ae
commit 19cc36accc
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sway/desktop/render.c
View file

@ -509,23 +509,24 @@ static void render_titlebar(struct render_context *ctx, struct sway_container *c
texture_box.y = round((bg_y - output_y) * output_scale) + texture_box.y = round((bg_y - output_y) * output_scale) +
ob_padding_above; ob_padding_above;
if (ob_inner_width < texture_box.width) { struct wlr_box clip_box = texture_box;
texture_box.width = ob_inner_width; if (ob_inner_width < clip_box.width) {
clip_box.width = ob_inner_width;
} }
render_texture(ctx, marks_texture, render_texture(ctx, marks_texture,
NULL, &texture_box, NULL, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha); NULL, &texture_box, &clip_box, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha);
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = texture_box.x + round(output_x * output_scale); box.x = clip_box.x + round(output_x * output_scale);
box.y = roundf((y + titlebar_border_thickness) * output_scale); box.y = roundf((y + titlebar_border_thickness) * output_scale);
box.width = texture_box.width; box.width = clip_box.width;
box.height = ob_padding_above; box.height = ob_padding_above;
render_rect(ctx, &box, color); render_rect(ctx, &box, color);
// Padding below // Padding below
box.y += ob_padding_above + texture_box.height; box.y += ob_padding_above + clip_box.height;
box.height = ob_padding_below; box.height = ob_padding_below;
render_rect(ctx, &box, color); render_rect(ctx, &box, color);
} }
@ -579,24 +580,25 @@ static void render_titlebar(struct render_context *ctx, struct sway_container *c
texture_box.y = texture_box.y =
round((bg_y - output_y) * output_scale) + ob_padding_above; round((bg_y - output_y) * output_scale) + ob_padding_above;
if (ob_inner_width - ob_marks_width < texture_box.width) { struct wlr_box clip_box = texture_box;
texture_box.width = ob_inner_width - ob_marks_width; if (ob_inner_width - ob_marks_width < clip_box.width) {
clip_box.width = ob_inner_width - ob_marks_width;
} }
render_texture(ctx, title_texture, render_texture(ctx, title_texture,
NULL, &texture_box, NULL, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha); NULL, &texture_box, &clip_box, WL_OUTPUT_TRANSFORM_NORMAL, con->alpha);
// Padding above // Padding above
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = texture_box.x + round(output_x * output_scale); box.x = clip_box.x + round(output_x * output_scale);
box.y = roundf((y + titlebar_border_thickness) * output_scale); box.y = roundf((y + titlebar_border_thickness) * output_scale);
box.width = texture_box.width; box.width = clip_box.width;
box.height = ob_padding_above; box.height = ob_padding_above;
render_rect(ctx, &box, color); render_rect(ctx, &box, color);
// Padding below // Padding below
box.y += ob_padding_above + texture_box.height; box.y += ob_padding_above + clip_box.height;
box.height = ob_padding_below; box.height = ob_padding_below;
render_rect(ctx, &box, color); render_rect(ctx, &box, color);
} }