Revert "Drag preselected items even when "prefer selection to dragging" enabled"

This reverts commit d530e2c2cd.
This commit is contained in:
Jon Evans 2020-10-01 18:23:30 -04:00
parent 803f53d6b2
commit 71ed7ee707
2 changed files with 2 additions and 4 deletions

View File

@ -375,8 +375,7 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
if( auto schframe = dynamic_cast<SCH_EDIT_FRAME*>( m_frame ) ) if( auto schframe = dynamic_cast<SCH_EDIT_FRAME*>( m_frame ) )
schframe->FocusOnItem( nullptr ); schframe->FocusOnItem( nullptr );
if( m_additive || m_subtractive || m_exclusive_or || if( m_additive || m_subtractive || m_exclusive_or || m_frame->GetDragSelects() )
( m_selection.Empty() && m_frame->GetDragSelects() ) )
{ {
selectMultiple(); selectMultiple();
} }

View File

@ -289,8 +289,7 @@ int SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
{ {
m_frame->FocusOnItem( nullptr ); m_frame->FocusOnItem( nullptr );
if( m_additive || m_subtractive || m_exclusive_or || if( m_additive || m_subtractive || m_exclusive_or || dragAlwaysSelects )
( m_selection.Empty() && dragAlwaysSelects ) )
{ {
selectMultiple(); selectMultiple();
} }