From: John Lindgren <john@jlindgren.net>
Date: Thu, 9 Feb 2023 04:40:59 +0000 (-0500)
Subject: menu: Compute usable area for the correct output
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=3941991505679ab5fe32efaeef278905e951627a;p=proto%2Flabwc.git

menu: Compute usable area for the correct output

If a menu was opened via keybind while the cursor was on another,
differently-sized output, the wrong usable area was used to
position the menu.
---

diff --git a/src/menu/menu.c b/src/menu/menu.c
index ecbeb50b..3bc74a62 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -531,7 +531,9 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
 	double oy = ly;
 	struct wlr_output *wlr_output = wlr_output_layout_output_at(
 		menu->server->output_layout, lx, ly);
-	if (!wlr_output) {
+	struct output *output = wlr_output ? output_from_wlr_output(
+		menu->server, wlr_output) : NULL;
+	if (!output) {
 		wlr_log(WLR_ERROR,
 			"Failed to position menu %s (%s) and its submenus: "
 			"Not enough screen space", menu->id, menu->label);
@@ -539,18 +541,17 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
 	}
 	wlr_output_layout_output_coords(menu->server->output_layout,
 		wlr_output, &ox, &oy);
-	struct wlr_box usable = output_usable_area_from_cursor_coords(menu->server);
 
 	if (align == LAB_MENU_OPEN_AUTO) {
 		int full_width = menu_get_full_width(menu);
-		if (ox + full_width > usable.width) {
+		if (ox + full_width > output->usable_area.width) {
 			align = LAB_MENU_OPEN_LEFT;
 		} else {
 			align = LAB_MENU_OPEN_RIGHT;
 		}
 	}
 
-	if (oy + menu->size.height > usable.height) {
+	if (oy + menu->size.height > output->usable_area.height) {
 		align &= ~LAB_MENU_OPEN_BOTTOM;
 		align |= LAB_MENU_OPEN_TOP;
 	} else {