mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use WOP_SELECTABLE option in menu.

Browse Source 
If menu is not active, it is not selectable also in order to disallow
select and focus the inactive menu.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-06-07 16:38:20 +03:00
parent 5ac1c5a3e0
commit a64a7ba2fa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/widget/menu.c
View File

@ -308,6 +308,7 @@ menubar_finish (WMenuBar * menubar)
menubar->is_active = FALSE;
w->lines = 1;
widget_want_hotkey (w, FALSE);
widget_set_options (w, WOP_SELECTABLE, FALSE);
/* Move the menubar to the bottom so that widgets displayed on top of
* an "invisible" menubar get the first chance to respond to mouse events. */
@ -892,8 +893,9 @@ menubar_new (int y, int x, int cols, GList * menu, gboolean visible)
menubar = g_new0 (WMenuBar, 1);
w = WIDGET (menubar);
widget_init (w, y, x, 1, cols, menubar_callback, menubar_mouse_callback);
/* initially, menubar is not selectable */
widget_set_options (w, WOP_SELECTABLE, FALSE);
w->options |= WOP_TOP_SELECT;
menubar->is_visible = visible;
menubar_set_menu (menubar, menu);
@ -1008,6 +1010,8 @@ menubar_activate (WMenuBar * menubar, gboolean dropped, int which)
if (!menubar->is_active)
{
widget_set_options (w, WOP_SELECTABLE, TRUE);
menubar->is_active = TRUE;
menubar->is_dropped = dropped;
if (which >= 0)