mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: Compute usable area for the correct output

Browse source 
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.
This commit is contained in:
John Lindgren 2023-02-08 23:40:59 -05:00
parent 103a2a8f6c
commit 3941991505
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/menu/menu.c
View file

@ -531,7 +531,9 @@ menu_configure(struct menu *menu, int lx, int ly, enum menu_align align)
double oy = ly; double oy = ly;
struct wlr_output *wlr_output = wlr_output_layout_output_at( struct wlr_output *wlr_output = wlr_output_layout_output_at(
menu->server->output_layout, lx, ly); 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, wlr_log(WLR_ERROR,
"Failed to position menu %s (%s) and its submenus: " "Failed to position menu %s (%s) and its submenus: "
"Not enough screen space", menu->id, menu->label); "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_layout_output_coords(menu->server->output_layout,
wlr_output, &ox, &oy); wlr_output, &ox, &oy);
struct wlr_box usable = output_usable_area_from_cursor_coords(menu->server);
if (align == LAB_MENU_OPEN_AUTO) { if (align == LAB_MENU_OPEN_AUTO) {
int full_width = menu_get_full_width(menu); 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; align = LAB_MENU_OPEN_LEFT;
} else { } else {
align = LAB_MENU_OPEN_RIGHT; 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_BOTTOM;
align |= LAB_MENU_OPEN_TOP; align |= LAB_MENU_OPEN_TOP;
} else { } else {