Merge pull request #2260 from emersion/fix-has-opaque-lockscreen

Fix output_has_opaque_lockscreen
This commit is contained in:
Drew DeVault 2018-07-13 04:33:58 -07:00 committed by GitHub
commit 671a202c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -204,11 +204,11 @@ bool output_has_opaque_lockscreen(struct sway_output *output,
}; };
pixman_region32_t surface_opaque_box; pixman_region32_t surface_opaque_box;
pixman_region32_init(&surface_opaque_box); pixman_region32_init(&surface_opaque_box);
pixman_region32_copy(&surface_opaque_box, &wlr_surface->current.opaque); pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region);
pixman_region32_translate(&surface_opaque_box, pixman_region32_translate(&surface_opaque_box,
sway_layer_surface->geo.x, sway_layer_surface->geo.y); sway_layer_surface->geo.x, sway_layer_surface->geo.y);
bool contains = pixman_region32_contains_rectangle( bool contains = pixman_region32_contains_rectangle(&surface_opaque_box,
&wlr_surface->current.opaque, &output_box); &output_box);
pixman_region32_fini(&surface_opaque_box); pixman_region32_fini(&surface_opaque_box);
if (contains) { if (contains) {
return true; return true;