diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-07 00:17:08 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-07 00:17:08 +1000 |
| commit | 3b842f4eed7276f44b0a9154976ecfeef07aa867 (patch) | |
| tree | 235dd57784778409413e911064bf830cf40c0689 /swaylock/main.c | |
| parent | 58b2c8ed142ded772382ae7811a217a5590b0c1c (diff) | |
Detect opaque lockscreen when using a solid color
Diffstat (limited to 'swaylock/main.c')
| -rw-r--r-- | swaylock/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index a2a8a36e..1c0cef2b 100644 --- a/swaylock/main.c +++ b/swaylock/main.c @@ -84,8 +84,11 @@ static const struct zwlr_layer_surface_v1_listener layer_surface_listener; static cairo_surface_t *select_image(struct swaylock_state *state, struct swaylock_surface *surface); -static bool image_is_opaque(cairo_surface_t *image) { - return cairo_surface_get_content(image) == CAIRO_CONTENT_COLOR; +static bool surface_is_opaque(struct swaylock_surface *surface) { + if (surface->image) { + return cairo_surface_get_content(surface->image) == CAIRO_CONTENT_COLOR; + } + return (surface->state->args.color & 0xff) == 0xff; } static void create_layer_surface(struct swaylock_surface *surface) { @@ -113,7 +116,7 @@ static void create_layer_surface(struct swaylock_surface *surface) { zwlr_layer_surface_v1_add_listener(surface->layer_surface, &layer_surface_listener, surface); - if (image_is_opaque(surface->image) && + if (surface_is_opaque(surface) && surface->state->args.mode != BACKGROUND_MODE_CENTER && surface->state->args.mode != BACKGROUND_MODE_FIT) { struct wl_region *region = |