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

Fixed blur/surfaces dst_box not being offset by the titlebar height (#185)

Browse source
This commit is contained in:
Erik Reider 2023-07-03 18:45:26 +02:00 committed by GitHub
parent edd7aa72bc
commit cda17aee16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sway/desktop/render.c
View file

@ -723,9 +723,18 @@ static void render_view_toplevels(struct sway_view *view, struct sway_output *ou
if (state.fullscreen_mode == FULLSCREEN_NONE if (state.fullscreen_mode == FULLSCREEN_NONE
&& (state.border == B_PIXEL || state.border == B_NORMAL)) { && (state.border == B_PIXEL || state.border == B_NORMAL)) {
clip_box.x += state.border_thickness; clip_box.x += state.border_thickness;
clip_box.y += state.border_thickness;
clip_box.width -= state.border_thickness * 2; clip_box.width -= state.border_thickness * 2;
clip_box.height -= state.border_thickness * 2;
if (deco_data.has_titlebar) {
// Shift the box downward to compensate for the titlebar
int titlebar_thickness = container_titlebar_height();
clip_box.y += titlebar_thickness;
clip_box.height -= state.border_thickness + titlebar_thickness;
} else {
// Regular border
clip_box.y += state.border_thickness;
clip_box.height -= state.border_thickness * 2;
}
} }
data.clip_box = &clip_box; data.clip_box = &clip_box;
@ -788,9 +797,18 @@ static void render_saved_view(struct sway_view *view, struct sway_output *output
dst_box.height = state.height; dst_box.height = state.height;
if (state.border == B_PIXEL || state.border == B_NORMAL) { if (state.border == B_PIXEL || state.border == B_NORMAL) {
dst_box.x += state.border_thickness; dst_box.x += state.border_thickness;
dst_box.y += state.border_thickness;
dst_box.width -= state.border_thickness * 2; dst_box.width -= state.border_thickness * 2;
dst_box.height -= state.border_thickness * 2;
if (deco_data.has_titlebar) {
// Shift the box downward to compensate for the titlebar
int titlebar_thickness = container_titlebar_height();
dst_box.y += titlebar_thickness;
dst_box.height -= state.border_thickness + titlebar_thickness;
} else {
// Regular border
dst_box.y += state.border_thickness;
dst_box.height -= state.border_thickness * 2;
}
} }
scale_box(&dst_box, wlr_output->scale); scale_box(&dst_box, wlr_output->scale);