sway

commit 671a202c94d3a3443f4bf538c48a6ab67ccd0f55
parent bcdf04d79c28866d971dc968a2497f7d95ec1aae
Author: Drew DeVault <sir@cmpwn.com>
Date:   Fri, 13 Jul 2018 04:33:58 -0700

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

Fix output_has_opaque_lockscreen
Diffstat:
M
sway/desktop/output.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
@@ -204,11 +204,11 @@ bool output_has_opaque_lockscreen(struct sway_output *output,
 		};
 		pixman_region32_t 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,
-				sway_layer_surface->geo.x, sway_layer_surface->geo.y);
-		bool contains = pixman_region32_contains_rectangle(
-				&wlr_surface->current.opaque, &output_box);
+			sway_layer_surface->geo.x, sway_layer_surface->geo.y);
+		bool contains = pixman_region32_contains_rectangle(&surface_opaque_box,
+			&output_box);
 		pixman_region32_fini(&surface_opaque_box);
 		if (contains) {
 			return true;