From 610b30364e1d5206b43b873e3f11d5d66d2e28e5 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 28 Apr 2018 08:16:21 +0900 Subject: wayland renderer: Fix bottom positioning - reset size when it changes, so there is no blank below text - ignore exclude zone to overlap bar regardless of rendering order --- lib/renderers/wayland/window.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/renderers/wayland/window.c') diff --git a/lib/renderers/wayland/window.c b/lib/renderers/wayland/window.c index e195e38..5ca4578 100644 --- a/lib/renderers/wayland/window.c +++ b/lib/renderers/wayland/window.c @@ -204,7 +204,7 @@ static const struct wl_callback_listener listener = { }; void -bm_wl_window_render(struct window *window, const struct bm_menu *menu) +bm_wl_window_render(struct window *window, struct wl_display *display, const struct bm_menu *menu) { assert(window && menu); @@ -229,6 +229,9 @@ bm_wl_window_render(struct window *window, const struct bm_menu *menu) break; window->height = result.height; + zwlr_layer_surface_v1_set_size(window->layer_surface, 0, window->height); + wl_surface_commit(window->surface); + wl_display_roundtrip(display); destroy_buffer(buffer); } @@ -299,6 +302,7 @@ bm_wl_window_create(struct window *window, struct wl_display *display, struct wl if (layer_shell && (window->layer_surface = zwlr_layer_shell_v1_get_layer_surface(layer_shell, surface, output, ZWLR_LAYER_SHELL_V1_LAYER_TOP, "menu"))) { zwlr_layer_surface_v1_add_listener(window->layer_surface, &layer_surface_listener, window); + zwlr_layer_surface_v1_set_exclusive_zone(window->layer_surface, -1); zwlr_layer_surface_v1_set_anchor(window->layer_surface, (window->bottom ? ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM : ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP) | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT); zwlr_layer_surface_v1_set_size(window->layer_surface, 0, 32); zwlr_layer_surface_v1_set_keyboard_interactivity(window->layer_surface, true); -- cgit v1.2.3-70-g09d2