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

Don't double-launch selection tool. 

Fixes: lp:1829741
* https://bugs.launchpad.net/kicad/+bug/1829741
This commit is contained in:
Jeff Young 2019-05-23 01:46:22 +01:00
parent 1f2bdf895e
commit d3777eaddf
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/sch_draw_panel.cpp
View File

@ -286,21 +286,12 @@ void SCH_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
{ {
m_abortRequest = true; m_abortRequest = true;
EE_SELECTION_TOOL* selTool = GetParent()->GetToolManager()->GetTool<EE_SELECTION_TOOL>(); if( frame->IsModal() )
if( selTool )
{
if( EE_CONDITIONS::Idle( selTool->GetSelection() ) )
GetParent()->GetToolManager()->RunAction( EE_ACTIONS::selectionActivate, true );
else
GetParent()->GetToolManager()->RunAction( ACTIONS::cancelInteractive, true );
keyWasHandled = true; // The key is captured: the key event will be not skipped
}
else if( frame->IsModal() )
{
frame->DismissModal( wxID_CANCEL ); frame->DismissModal( wxID_CANCEL );
} else
GetParent()->GetToolManager()->RunAction( ACTIONS::cancelInteractive, true );
keyWasHandled = true; // The key is captured: the key event will be not skipped
} }
/* Normalize keys code to easily handle keys from Ctrl+A to Ctrl+Z /* Normalize keys code to easily handle keys from Ctrl+A to Ctrl+Z