diff options
author | Ilia Bozhinov <ammen99@gmail.com> | 2019-08-19 12:20:51 +0300 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-08-19 12:28:40 +0300 |
commit | 06c36f8435bacefa1a7a06c475dd5fff9b7b97e0 (patch) | |
tree | 7daafa31e8e32c86f7bb11f9a97863ee67a56685 /sway | |
parent | input/seatop_down: add axis handler (diff) | |
download | sway-06c36f8435bacefa1a7a06c475dd5fff9b7b97e0.tar.gz sway-06c36f8435bacefa1a7a06c475dd5fff9b7b97e0.tar.zst sway-06c36f8435bacefa1a7a06c475dd5fff9b7b97e0.zip |
properly check pixman_region32_contains_rectangle return
pixman_region32_contains_rectangle() returns
pixman_region_intersection_t not a bool.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/desktop/output.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 1f3cc938..4bfc3b77 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -390,10 +390,11 @@ bool output_has_opaque_overlay_layer_surface(struct sway_output *output) { | |||
390 | pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region); | 390 | pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region); |
391 | pixman_region32_translate(&surface_opaque_box, | 391 | pixman_region32_translate(&surface_opaque_box, |
392 | sway_layer_surface->geo.x, sway_layer_surface->geo.y); | 392 | sway_layer_surface->geo.x, sway_layer_surface->geo.y); |
393 | bool contains = pixman_region32_contains_rectangle(&surface_opaque_box, | 393 | pixman_region_overlap_t contains = |
394 | &output_box); | 394 | pixman_region32_contains_rectangle(&surface_opaque_box, &output_box); |
395 | pixman_region32_fini(&surface_opaque_box); | 395 | pixman_region32_fini(&surface_opaque_box); |
396 | if (contains) { | 396 | |
397 | if (contains == PIXMAN_REGION_IN) { | ||
397 | return true; | 398 | return true; |
398 | } | 399 | } |
399 | } | 400 | } |