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

Don't pass Cancel event where there was a specific action cancelled. 

For instance, if during a move the user hits ESC they only want the
move cancelled, not (for instance) the selection dropped.

Fixes https://gitlab.com/kicad/code/kicad/issues/5356
This commit is contained in:
Jeff Young 2020-08-25 12:53:39 +01:00
parent d122321162
commit 1138c32bf3
6 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/tool/picker_tool.cpp
View File

@ -88,9 +88,14 @@ int PICKER_TOOL::Main( const TOOL_EVENT& aEvent )
// Activating a new tool may have alternate finalization from canceling the current
// tool
if( evt->IsActivate() )
{
finalize_state = END_ACTIVATE;
}
else
{
evt->SetPassEvent( false );
finalize_state = EVT_CANCEL;
}
break;
}

3
eeschema/tools/lib_move_tool.cpp
View File

@ -204,7 +204,10 @@ int LIB_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
else if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_moveInProgress )
{
evt->SetPassEvent( false );
restore_state = true;
}
break;
}

3
eeschema/tools/sch_move_tool.cpp
View File

@ -352,7 +352,10 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
else if( evt->IsCancelInteractive() )
{
if( m_moveInProgress )
{
evt->SetPassEvent( false );
restore_state = true;
}
break;
}

2
include/tool/tool_event.h
View File

@ -253,7 +253,7 @@ public:
///> be passed on to subsequent tools on the stack. Defaults to true for TC_MESSAGES; false
///> for everything else.
bool PassEvent() const { return m_passEvent; }
void SetPassEvent() { m_passEvent = true; }
void SetPassEvent( bool aPass = true ) { m_passEvent = aPass; }
///> Returns if it this event has a valid position (true for mouse events and context-menu
///> or hotkey-based command events)

3
pagelayout_editor/tools/pl_edit_tool.cpp
View File

@ -192,7 +192,10 @@ int PL_EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
else if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_moveInProgress )
{
evt->SetPassEvent( false );
restore_state = true;
}
break;
}

3
pcbnew/tools/edit_tool.cpp
View File

@ -573,6 +573,9 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
else if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_dragging && evt->IsCancelInteractive() )
evt->SetPassEvent( false );
restore_state = true; // Canceling the tool means that items have to be restored
break; // Finish
}