haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert IsAttached() fix as it doesn't handle hotkeys from the main menubar. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17101

(cherry picked from commit 6ec51f6a69)
This commit is contained in:
Jeff Young 2024-02-25 15:45:34 +00:00
parent 46555ab975
commit 11593a7c04
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/tool/action_menu.cpp
View File

@ -546,11 +546,10 @@ void ACTION_MENU::OnMenuEvent( wxMenuEvent& aEvent )
{
evt->SetMousePosition( g_menu_open_position );
}
// Check if it is a menubar event, and don't get any position if it is.
// The original hack is to see if g_last_menu_highlighted_id matches to see if it's a menubar menu event
// IsAttached() checks to see if a menubar was attached to the menu by wx, and if there is one, then the event
// is from a menubar menu.
else if( IsAttached() || ( g_last_menu_highlighted_id == aEvent.GetId() ) )
// Check if it is a menubar event, and don't get any position if it is. Note that we
// can't use IsAttached() here, as it only differentiates a context menu, and we also
// want a hotkey to generate a position.
else if( g_last_menu_highlighted_id == aEvent.GetId() )
{
evt->SetHasPosition( false );
}