diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-13 04:33:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-13 04:33:58 -0700 |
commit | 671a202c94d3a3443f4bf538c48a6ab67ccd0f55 (patch) | |
tree | 699e728422c9034474f88cc773395871e51a930f | |
parent | Merge pull request #2252 from rkubosz/scroll-button-option (diff) | |
parent | Fix output_has_opaque_lockscreen (diff) | |
download | sway-671a202c94d3a3443f4bf538c48a6ab67ccd0f55.tar.gz sway-671a202c94d3a3443f4bf538c48a6ab67ccd0f55.tar.zst sway-671a202c94d3a3443f4bf538c48a6ab67ccd0f55.zip |
Merge pull request #2260 from emersion/fix-has-opaque-lockscreen
Fix output_has_opaque_lockscreen
-rw-r--r-- | sway/desktop/output.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 73108450..a2720885 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -204,11 +204,11 @@ bool output_has_opaque_lockscreen(struct sway_output *output, | |||
204 | }; | 204 | }; |
205 | pixman_region32_t surface_opaque_box; | 205 | pixman_region32_t surface_opaque_box; |
206 | pixman_region32_init(&surface_opaque_box); | 206 | pixman_region32_init(&surface_opaque_box); |
207 | pixman_region32_copy(&surface_opaque_box, &wlr_surface->current.opaque); | 207 | pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region); |
208 | pixman_region32_translate(&surface_opaque_box, | 208 | pixman_region32_translate(&surface_opaque_box, |
209 | sway_layer_surface->geo.x, sway_layer_surface->geo.y); | 209 | sway_layer_surface->geo.x, sway_layer_surface->geo.y); |
210 | bool contains = pixman_region32_contains_rectangle( | 210 | bool contains = pixman_region32_contains_rectangle(&surface_opaque_box, |
211 | &wlr_surface->current.opaque, &output_box); | 211 | &output_box); |
212 | pixman_region32_fini(&surface_opaque_box); | 212 | pixman_region32_fini(&surface_opaque_box); |
213 | if (contains) { | 213 | if (contains) { |
214 | return true; | 214 | return true; |