BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win: don't create shadow image when not requested 

win_set_shadow tries to create shadow image even when shadow_new is false, this
is incorrect.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-07-27 00:02:40 +01:00
parent a229f34eaa
commit 6ac50626ef
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/win.c
View File

@ -568,18 +568,6 @@ void win_set_shadow(session_t *ps, struct managed_win *w, bool shadow_new) {
log_debug("Updating shadow property of window %#010x (%s) to %d", w->base.id, log_debug("Updating shadow property of window %#010x (%s) to %d", w->base.id,
w->name, shadow_new); w->name, shadow_new);
if (ps->backend_data && w->state != WSTATE_UNMAPPED &&
!(w->flags & WIN_FLAGS_IMAGE_ERROR)) {
assert(!w->shadow_image);
// Create shadow image
w->shadow_image = ps->backend_data->ops->render_shadow(
ps->backend_data, w->widthb, w->heightb, ps->gaussian_map, ps->o.shadow_red,
ps->o.shadow_green, ps->o.shadow_blue, ps->o.shadow_opacity);
if (!w->shadow_image) {
log_error("Failed to bind shadow image");
w->shadow_force = OFF;
}
}
region_t extents; region_t extents;
pixman_region32_init(&extents); pixman_region32_init(&extents);
@ -600,6 +588,19 @@ void win_set_shadow(session_t *ps, struct managed_win *w, bool shadow_new) {
if (w->shadow) { if (w->shadow) {
win_extents(w, &extents); win_extents(w, &extents);
add_damage_from_win(ps, w); add_damage_from_win(ps, w);
if (ps->backend_data && w->state != WSTATE_UNMAPPED &&
!(w->flags & WIN_FLAGS_IMAGE_ERROR)) {
assert(!w->shadow_image);
// Create shadow image
w->shadow_image = ps->backend_data->ops->render_shadow(
ps->backend_data, w->widthb, w->heightb, ps->gaussian_map,
ps->o.shadow_red, ps->o.shadow_green, ps->o.shadow_blue,
ps->o.shadow_opacity);
if (!w->shadow_image) {
log_error("Failed to bind shadow image");
w->shadow_force = OFF;
}
}
} }
pixman_region32_fini(&extents); pixman_region32_fini(&extents);
} }