mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: s/menu_open/menu_open_root/

Browse source 
...to be consistent with the 'close' equivalent
This commit is contained in:
Johan Malm 2023-10-31 21:08:04 +00:00 • committed by Johan Malm
parent e79bbd3022
commit 138979c506
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/menu/menu.h
View file

@ -81,14 +81,14 @@ void menu_finish(struct server *server);
struct menu *menu_get_by_id(struct server *server, const char *id); struct menu *menu_get_by_id(struct server *server, const char *id);
/** /**
* menu_open - open menu on position (x, y) * menu_open_root - open menu on position (x, y)
* *
* This function will close server->menu_current, open the * This function will close server->menu_current, open the
* new menu and assign @menu to server->menu_current. * new menu and assign @menu to server->menu_current.
* *
* Additionally, server->input_mode wil be set to LAB_INPUT_STATE_MENU. * Additionally, server->input_mode wil be set to LAB_INPUT_STATE_MENU.
*/ */
void menu_open(struct menu *menu, int x, int y); void menu_open_root(struct menu *menu, int x, int y);
/** /**
* menu_process_cursor_motion * menu_process_cursor_motion

2
src/action.c
View file

@ -605,7 +605,7 @@ show_menu(struct server *server, struct view *view,
/* Replaced by next show_menu() or cleaned on view_destroy() */ /* Replaced by next show_menu() or cleaned on view_destroy() */
menu->triggered_by_view = view; menu->triggered_by_view = view;
menu_open(menu, x, y); menu_open_root(menu, x, y);
} }
static struct view * static struct view *

2
src/menu/menu.c
View file

@ -842,7 +842,7 @@ menu_close(struct menu *menu)
} }
void void
menu_open(struct menu *menu, int x, int y) menu_open_root(struct menu *menu, int x, int y)
{ {
assert(menu); assert(menu);
if (menu->server->menu_current) { if (menu->server->menu_current) {