sway

commit 464d4d58892597f31da3fcdbcfcd7928643a9ec3
parent 948078122932a9782bbf1042356b62099b0cd25f
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Sat,  7 Jul 2018 01:18:54 +1000

Translate surface by its geo when doing opaque box check

Diffstat:
M
sway/desktop/output.c
 | 
13
+++++++++++--

1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
@@ -930,12 +930,21 @@ bool output_has_opaque_lockscreen(struct sway_output *output,
 		if (wlr_surface->resource->client != seat->exclusive_client) {
 			continue;
 		}
+		struct sway_layer_surface *sway_layer_surface =
+			layer_from_wlr_layer_surface(wlr_layer_surface);
 		pixman_box32_t output_box = {
 			.x2 = output->swayc->current.swayc_width,
 			.y2 = output->swayc->current.swayc_height,
 		};
-		if (pixman_region32_contains_rectangle(&wlr_surface->current.opaque,
-					&output_box)) {
+		pixman_region32_t surface_opaque_box;
+		pixman_region32_init(&surface_opaque_box);
+		pixman_region32_copy(&surface_opaque_box, &wlr_surface->current.opaque);
+		pixman_region32_translate(&surface_opaque_box,
+				sway_layer_surface->geo.x, sway_layer_surface->geo.y);
+		bool contains = pixman_region32_contains_rectangle(
+				&wlr_surface->current.opaque, &output_box);
+		pixman_region32_fini(&surface_opaque_box);
+		if (contains) {
 			return true;
 		}
 	}