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

Send wxEVENT_CHAR to GUI (if the key is not a special key that scrolls the draw panel) both on Linux and Windows 

fix lp:1718488
This commit is contained in:
jean-pierre charras 2017-09-20 19:41:59 +02:00
parent 90c3d41f67
commit b18601dfc6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/tool/tool_dispatcher.cpp
View File

@ -309,6 +309,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
bool motion = false, buttonEvents = false; bool motion = false, buttonEvents = false;
boost::optional<TOOL_EVENT> evt; boost::optional<TOOL_EVENT> evt;
int key = 0; // key = 0 if the event is not a key event int key = 0; // key = 0 if the event is not a key event
bool keyIsSpecial = false; // True if the key is a special key code
int type = aEvent.GetEventType(); int type = aEvent.GetEventType();
@ -357,13 +358,14 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
{ {
wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent ); wxKeyEvent* ke = static_cast<wxKeyEvent*>( &aEvent );
key = ke->GetKeyCode(); key = ke->GetKeyCode();
keyIsSpecial = isKeySpecialCode( key );
// if the key event must be skipped, skip it here if the event is a wxEVT_CHAR_HOOK // if the key event must be skipped, skip it here if the event is a wxEVT_CHAR_HOOK
// and do nothing. // and do nothing.
// a wxEVT_CHAR will be fired by wxWidgets later for this key. // a wxEVT_CHAR will be fired by wxWidgets later for this key.
if( type == wxEVT_CHAR_HOOK ) if( type == wxEVT_CHAR_HOOK )
{ {
if( !isKeySpecialCode( key ) ) if( !keyIsSpecial )
{ {
aEvent.Skip(); aEvent.Skip();
return; return;
@ -406,18 +408,18 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
// in pcbnew and the footprint editor any time a hotkey is used. The correct procedure is // in pcbnew and the footprint editor any time a hotkey is used. The correct procedure is
// to NOT pass wxEVT_CHAR events to the GUI under OS X. // to NOT pass wxEVT_CHAR events to the GUI under OS X.
// //
// On Windows, avoid to call wxEvent::Skip because some keys (ARROWS, PAGE_UP, PAGE_DOWN // On Windows, avoid to call wxEvent::Skip for special keys because some keys (ARROWS, PAGE_UP, PAGE_DOWN
// have predefined actions (like move thumbtrack cursor), and we do not want these // have predefined actions (like move thumbtrack cursor), and we do not want these
// actions executed (most are handled by Kicad) // actions executed (most are handled by Kicad)
if( !evt || type == wxEVT_LEFT_DOWN ) if( !evt || type == wxEVT_LEFT_DOWN )
aEvent.Skip(); aEvent.Skip();
// On Linux, the suitable Skip is already called, but the wxEVT_CHAR // The suitable Skip is already called, but the wxEVT_CHAR
// must be Skipped (sent to GUI). // must be Skipped (sent to GUI).
// Otherwise accelerators are not seen. // Otherwise accelerators and shortcuts in main menu or toolbars are not seen.
#ifdef __LINUX__ #ifndef __APPLE__
if( type == wxEVT_CHAR ) if( type == wxEVT_CHAR && !keyIsSpecial )
aEvent.Skip(); aEvent.Skip();
#endif #endif