gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes triggering callback for inactive menu items (#1159)

Browse Source 
The old code would trigger a callback when hovering the
mouse of an inactive item and pressing Return.
This commit is contained in:
Matthias Melcher 2024-12-09 19:57:23 +01:00
parent 5af4108169
commit 05ee86fe57
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Fl_Menu.cxx
View File

@ -841,10 +841,19 @@ int menuwindow::handle_part1(int e) {
case ' ':
// if the current item is a submenu with no callback,
// simulate FL_Right to enter the submenu
if (pp.current_item && (!pp.menubar || pp.menu_number > 0) &&
pp.current_item->activevisible() && pp.current_item->submenu() && !pp.current_item->callback_)
if ( pp.current_item
&& (!pp.menubar || pp.menu_number > 0)
&& pp.current_item->activevisible()
&& pp.current_item->submenu()
&& !pp.current_item->callback_)
{
goto RIGHT;
if (pp.current_item && pp.current_item->activevisible()) pp.state = DONE_STATE;
}
// Ignore keypresses over inactive items, mark KEYBOARD event as used.
if (pp.current_item && !pp.current_item->activevisible())
return 1;
// Mark the menu 'done' which will trigger the callback
pp.state = DONE_STATE;
return 1;
case FL_Escape:
setitem(0, -1, 0);