mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/labwc/labwc

Browse source
This commit is contained in:
Johan Malm 2022-03-19 11:35:26 +00:00
commit 06042337d6
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/menu/menu.c
View file

@ -357,6 +357,12 @@ 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) {
wlr_log(WLR_ERROR,
"Failed to position menu %s (%s) and its submenus: "
"Not enough screen space", menu->id, menu->label);
return;
}
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); struct wlr_box usable = output_usable_area_from_cursor_coords(menu->server);
@ -587,6 +593,7 @@ void
menu_reconfigure(struct server *server) menu_reconfigure(struct server *server)
{ {
menu_finish(); menu_finish();
server->menu_current = NULL;
menu_init_rootmenu(server); menu_init_rootmenu(server);
menu_init_windowmenu(server); menu_init_windowmenu(server);
} }