From 231076a58ff5953acb51497757c8dc5d60bc24aa Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Fri, 24 Sep 2021 22:04:47 +0100 Subject: [PATCH] Simplify desktop_view_at() --- src/desktop.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index 5c229f4f..c7e153b3 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -308,12 +308,18 @@ desktop_view_at(struct server *server, double lx, double ly, if (!output) { return NULL; } - if ((*surface = layer_surface_at(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], - lx, ly, sx, sy))) { + + *surface = layer_surface_at( + &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], + lx, ly, sx, sy); + if (surface) return NULL; } - if ((*surface = layer_surface_at(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], - lx, ly, sx, sy))) { + + *surface = layer_surface_at( + &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], + lx, ly, sx, sy); + if (surface) return NULL; } @@ -333,14 +339,4 @@ desktop_view_at(struct server *server, double lx, double ly, return view; } } - - if ((*surface = layer_surface_at(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM], - lx, ly, sx, sy))) { - return NULL; - } - if ((*surface = layer_surface_at(&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND], - lx, ly, sx, sy))) { - return NULL; - } - return NULL; }