Merge 9740d37d17 into d58c9dc365

Anchor only the top edge of the menu to the center when
--center mode is used instead of centering the entire menu. This
prevents the menu from bouncing around as the list is shortened.

For this to work we only anchor to the top instead of the top and
the bottom and set a top margin equal to half of the display width.
The max height of the menu also needs to be halved to prevent drawing
a menu that overflows the bottom edge of the screen.

VERSION

@@ -1 +1 @@
-0.6.20
+0.6.21

lib/renderers/wayland/window.c

@@ -217,10 +217,8 @@ get_align_anchor(enum bm_align align)
 {
     uint32_t anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
 
-    if(align == BM_ALIGN_TOP) {
+    if(align == BM_ALIGN_TOP || align == BM_ALIGN_CENTER) {
         anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
-    } else if(align == BM_ALIGN_CENTER) {
-        anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
     } else {
         anchor |= ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
     }
@@ -256,7 +254,11 @@ bm_wl_window_render(struct window *window, struct wl_display *display, struct bm
             break;
 
         struct cairo_paint_result result;
-        window->notify.render(&buffer->cairo, buffer->width, window->max_height, menu, &result);
+        uint32_t max_height = window->max_height;
+        if (menu->align == BM_ALIGN_CENTER) {
+            max_height /= 2;
+        }
+        window->notify.render(&buffer->cairo, buffer->width, max_height, menu, &result);
         window->displayed = result.displayed;
 
         if (window->height == (uint32_t) ceil(result.height / window->scale))
@@ -378,6 +380,9 @@ bm_wl_window_set_align(struct window *window, struct wl_display *display, enum b
     window->align_anchor = get_align_anchor(window->align);
 
     zwlr_layer_surface_v1_set_anchor(window->layer_surface, window->align_anchor);
+    if (align == BM_ALIGN_CENTER) {
+        zwlr_layer_surface_v1_set_margin(window->layer_surface, window->max_height / 2, 0, 0, 0);
+    }
     wl_surface_commit(window->surface);
     wl_display_roundtrip(display);
 }