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

Don't allow selection dragging when a picker tool is running. 

Fixes: lp:1841691
* https://bugs.launchpad.net/kicad/+bug/1841691
This commit is contained in:
Jeff Young 2019-08-30 10:32:43 +01:00
parent 7ed415cab3
commit 79d062aefc
2 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
common/tool/picker_tool.cpp
View File

@ -71,7 +71,31 @@ int PICKER_TOOL::Main( const TOOL_EVENT& aEvent )
m_frame->GetCanvas()->SetCurrentCursor( m_cursor ); m_frame->GetCanvas()->SetCurrentCursor( m_cursor );
VECTOR2D cursorPos = controls->GetCursorPosition( snap && !evt->Modifier( MD_ALT ) ); VECTOR2D cursorPos = controls->GetCursorPosition( snap && !evt->Modifier( MD_ALT ) );
if( evt->IsClick( BUT_LEFT ) ) if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_cancelHandler )
{
try
{
(*m_cancelHandler)();
}
catch( std::exception& e )
{
std::cerr << "PICKER_TOOL cancel handler error: " << e.what() << std::endl;
}
}
// Activating a new tool may have alternate finalization from canceling the current
// tool
if( evt->IsActivate() )
finalize_state = END_ACTIVATE;
else
finalize_state = EVT_CANCEL;
break;
}
else if( evt->IsClick( BUT_LEFT ) )
{ {
bool getNext = false; bool getNext = false;
@ -115,33 +139,16 @@ int PICKER_TOOL::Main( const TOOL_EVENT& aEvent )
} }
} }
else if( evt->IsCancelInteractive() || evt->IsActivate() ) else if( evt->IsDblClick( BUT_LEFT ) || evt->IsDrag( BUT_LEFT ) )
{ {
if( m_cancelHandler ) // Not currently used, but we don't want to pass them either
{
try
{
(*m_cancelHandler)();
}
catch( std::exception& e )
{
std::cerr << "PICKER_TOOL cancel handler error: " << e.what() << std::endl;
}
}
// Activating a new tool may have alternate finalization from canceling the current
// tool
if( evt->IsActivate() )
finalize_state = END_ACTIVATE;
else
finalize_state = EVT_CANCEL;
break;
} }
else if( evt->IsClick( BUT_RIGHT ) ) else if( evt->IsClick( BUT_RIGHT ) )
{ {
m_menu.ShowContextMenu(); m_menu.ShowContextMenu();
} }
else else
evt->SetPassEvent(); evt->SetPassEvent();
} }

47
pcbnew/tools/pcbnew_picker_tool.cpp
View File

@ -59,7 +59,30 @@ int PCBNEW_PICKER_TOOL::Main( const TOOL_EVENT& aEvent )
VECTOR2I cursorPos = grid.BestSnapAnchor( controls->GetMousePosition(), nullptr ); VECTOR2I cursorPos = grid.BestSnapAnchor( controls->GetMousePosition(), nullptr );
controls->ForceCursorPosition(true, cursorPos ); controls->ForceCursorPosition(true, cursorPos );
if( evt->IsClick( BUT_LEFT ) ) if( evt->IsCancelInteractive() || evt->IsActivate() )
{
if( m_cancelHandler )
{
try
{
(*m_cancelHandler)();
}
catch( std::exception& e )
{
std::cerr << "PCBNEW_PICKER_TOOL cancelHandler error: " << e.what() << std::endl;
}
}
// Activating a new tool may have alternate finalization from canceling the current tool
if( evt->IsActivate() )
finalize_state = END_ACTIVATE;
else
finalize_state = EVT_CANCEL;
break;
}
else if( evt->IsClick( BUT_LEFT ) )
{ {
bool getNext = false; bool getNext = false;
@ -103,27 +126,9 @@ int PCBNEW_PICKER_TOOL::Main( const TOOL_EVENT& aEvent )
} }
} }
else if( evt->IsCancelInteractive() || evt->IsActivate() ) else if( evt->IsDblClick( BUT_LEFT ) || evt->IsDrag( BUT_LEFT ) )
{ {
if( m_cancelHandler ) // Not currently used, but we don't want to pass them either
{
try
{
(*m_cancelHandler)();
}
catch( std::exception& e )
{
std::cerr << "PCBNEW_PICKER_TOOL cancelHandler error: " << e.what() << std::endl;
}
}
// Activating a new tool may have alternate finalization from canceling the current tool
if( evt->IsActivate() )
finalize_state = END_ACTIVATE;
else
finalize_state = EVT_CANCEL;
break;
} }
else if( evt->IsClick( BUT_RIGHT ) ) else if( evt->IsClick( BUT_RIGHT ) )