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

Don't process hotkeys on text entries 

Thanks @jeffyoung for the suggestion

Fixes https://gitlab.com/kicad/code/kicad/-/issues/4463
Fixes https://gitlab.com/kicad/code/kicad/-/issues/1941
This commit is contained in:
Jon Evans 2020-05-29 21:20:03 -04:00
parent 112316cdfb
commit fbef52ec33
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eda_draw_frame.cpp
View File

@ -196,6 +196,10 @@ void EDA_DRAW_FRAME::unitsChangeRefresh()
bool EDA_DRAW_FRAME::DispatchBehindModalDialog( wxKeyEvent& aEvent ) bool EDA_DRAW_FRAME::DispatchBehindModalDialog( wxKeyEvent& aEvent )
{ {
// Never process hotkeys when a text entry field is focused
if( dynamic_cast<wxTextEntry*>( FindFocus() ) )
return false;
static std::set<const TOOL_ACTION*> whiteList = { &ACTIONS::toggleUnits, static std::set<const TOOL_ACTION*> whiteList = { &ACTIONS::toggleUnits,
&ACTIONS::imperialUnits, &ACTIONS::imperialUnits,
&ACTIONS::metricUnits }; &ACTIONS::metricUnits };

5
common/tool/tool_dispatcher.cpp
View File

@ -483,7 +483,10 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent ); wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent );
keyIsEscape = ( ke->GetKeyCode() == WXK_ESCAPE ); keyIsEscape = ( ke->GetKeyCode() == WXK_ESCAPE );
evt = GetToolEvent( ke, &keyIsSpecial );
// Never process key events for tools when a text entry has focus
if( !dynamic_cast<wxTextEntry*>( wxWindow::FindFocus() ) )
evt = GetToolEvent( ke, &keyIsSpecial );
} }
else if( type == wxEVT_MENU_OPEN || type == wxEVT_MENU_CLOSE || type == wxEVT_MENU_HIGHLIGHT ) else if( type == wxEVT_MENU_OPEN || type == wxEVT_MENU_CLOSE || type == wxEVT_MENU_HIGHLIGHT )
{ {