Code clarity.
This commit is contained in:
parent
4226839586
commit
bb74445dda
|
@ -1115,8 +1115,9 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
|
||||||
picker->SetClickHandler(
|
picker->SetClickHandler(
|
||||||
[this]( const VECTOR2D& aPosition ) -> bool
|
[this]( const VECTOR2D& aPosition ) -> bool
|
||||||
{
|
{
|
||||||
if( m_pickerItem )
|
if( !m_pickerItem )
|
||||||
{
|
return true; // keep going (ignore click with no target)
|
||||||
|
|
||||||
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
|
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
|
||||||
|
|
||||||
if( !m_meander )
|
if( !m_meander )
|
||||||
|
@ -1136,6 +1137,7 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
|
||||||
m_pickerItem->GetEffectiveShape()->Collide( aPosition, dummyClearance,
|
m_pickerItem->GetEffectiveShape()->Collide( aPosition, dummyClearance,
|
||||||
&dummyDist, &closestPt );
|
&dummyDist, &closestPt );
|
||||||
m_meander->SetPosition( closestPt );
|
m_meander->SetPosition( closestPt );
|
||||||
|
return true; // keep going
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1149,9 +1151,6 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
|
||||||
|
|
||||||
return false; // exit picker tool
|
return false; // exit picker tool
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} );
|
} );
|
||||||
|
|
||||||
picker->SetMotionHandler(
|
picker->SetMotionHandler(
|
||||||
|
@ -1213,6 +1212,7 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
|
||||||
|
|
||||||
if( m_meander )
|
if( m_meander )
|
||||||
{
|
{
|
||||||
|
// First click already made; clean up meander preview
|
||||||
m_meander->EditRevert( generatorTool, m_board, m_frame, nullptr );
|
m_meander->EditRevert( generatorTool, m_board, m_frame, nullptr );
|
||||||
|
|
||||||
delete m_meander;
|
delete m_meander;
|
||||||
|
|
Loading…
Reference in New Issue