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

When ignoring click events don't ignore synthetic ones. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7255
This commit is contained in:
Jeff Young 2021-07-29 18:06:28 +01:00
parent 539d14ce94
commit 8aea2cbd03
2 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/tool/common_tools.cpp
View File

@ -143,6 +143,7 @@ int COMMON_TOOLS::CursorControl( const TOOL_EVENT& aEvent )
button = BUT_RIGHT; button = BUT_RIGHT;
TOOL_EVENT evt( TC_MOUSE, action, button | modifiers ); TOOL_EVENT evt( TC_MOUSE, action, button | modifiers );
evt.SetParameter( type );
evt.SetMousePosition( getViewControls()->GetCursorPosition() ); evt.SetMousePosition( getViewControls()->GetCursorPosition() );
m_toolMgr->ProcessEvent( evt ); m_toolMgr->ProcessEvent( evt );

87
pcbnew/tools/edit_tool.cpp
View File

@ -733,65 +733,65 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
if( frame()->Settings().m_AllowFreePads ) if( frame()->Settings().m_AllowFreePads )
{ {
selection = m_selectionTool->RequestSelection( selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool ) []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, PCB_SELECTION_TOOL* sTool )
{
std::set<BOARD_ITEM*> to_add;
// Iterate from the back so we don't have to worry about removals.
for( int i = aCollector.GetCount() - 1; i >= 0; --i )
{ {
BOARD_ITEM* item = aCollector[i]; std::set<BOARD_ITEM*> to_add;
if( item->Type() == PCB_MARKER_T ) // Iterate from the back so we don't have to worry about removals.
aCollector.Remove( item ); for( int i = aCollector.GetCount() - 1; i >= 0; --i )
// Locked pads do not get moved independently of the footprint
if( !sTool->IsFootprintEditor() && item->Type() == PCB_PAD_T
&& item->IsLocked() )
{ {
if( !aCollector.HasItem( item->GetParent() ) ) BOARD_ITEM* item = aCollector[i];
to_add.insert( item->GetParent() );
aCollector.Remove( item ); if( item->Type() == PCB_MARKER_T )
aCollector.Remove( item );
// Locked pads do not get moved independently of the footprint
if( !sTool->IsFootprintEditor() && item->Type() == PCB_PAD_T
&& item->IsLocked() )
{
if( !aCollector.HasItem( item->GetParent() ) )
to_add.insert( item->GetParent() );
aCollector.Remove( item );
}
} }
}
for( BOARD_ITEM* item : to_add ) for( BOARD_ITEM* item : to_add )
aCollector.Append( item ); aCollector.Append( item );
}, },
!m_isFootprintEditor /* prompt user regarding locked items only in pcb editor*/ ); !m_isFootprintEditor /* prompt user regarding locked items only in pcb editor*/ );
} }
else else
{ {
// Unlocked pads are treated as locked if the setting m_AllowFreePads is false // Unlocked pads are treated as locked if the setting m_AllowFreePads is false
selection = m_selectionTool->RequestSelection( selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector,
PCB_SELECTION_TOOL* sTool ) PCB_SELECTION_TOOL* sTool )
{
std::set<BOARD_ITEM*> to_add;
// Iterate from the back so we don't have to worry about removals.
for( int i = aCollector.GetCount() - 1; i >= 0; --i )
{ {
BOARD_ITEM* item = aCollector[i]; std::set<BOARD_ITEM*> to_add;
if( item->Type() == PCB_MARKER_T ) // Iterate from the back so we don't have to worry about removals.
aCollector.Remove( item ); for( int i = aCollector.GetCount() - 1; i >= 0; --i )
// Treat all pads as locked (i.e. cannot be moved independently of footprint)
if( !sTool->IsFootprintEditor() && item->Type() == PCB_PAD_T )
{ {
if( !aCollector.HasItem( item->GetParent() ) ) BOARD_ITEM* item = aCollector[i];
to_add.insert( item->GetParent() );
aCollector.Remove( item ); if( item->Type() == PCB_MARKER_T )
aCollector.Remove( item );
// Treat all pads as locked (i.e. cannot be moved independently of parent)
if( !sTool->IsFootprintEditor() && item->Type() == PCB_PAD_T )
{
if( !aCollector.HasItem( item->GetParent() ) )
to_add.insert( item->GetParent() );
aCollector.Remove( item );
}
} }
}
for( BOARD_ITEM* item : to_add ) for( BOARD_ITEM* item : to_add )
aCollector.Append( item ); aCollector.Append( item );
}, },
!m_isFootprintEditor /* prompt user regarding locked items only in pcb editor*/ ); !m_isFootprintEditor /* prompt user regarding locked items only in pcb editor*/ );
} }
if( selection.Empty() ) if( selection.Empty() )
@ -1049,7 +1049,8 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
break; // finish -- we moved exactly, so we are finished break; // finish -- we moved exactly, so we are finished
} }
else if( hasMouseMoved && ( evt->IsMouseUp( BUT_LEFT ) || evt->IsClick( BUT_LEFT ) ) ) else if( ( hasMouseMoved || evt->Parameter<intptr_t>() == ACTIONS::CURSOR_CLICK )
&& ( evt->IsMouseUp( BUT_LEFT ) || evt->IsClick( BUT_LEFT ) ) )
{ {
// Ignore mouse up and click events until we receive at least one mouse move or // Ignore mouse up and click events until we receive at least one mouse move or
// mouse drag event // mouse drag event