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

Revert "Fix handling of selection overlay in schematic editor" 

This reverts commit e2711a6121.

This ended up being too complex for 7.0
This commit is contained in:
Jon Evans 2023-02-16 16:43:57 -05:00
parent f23c6b0c2f
commit cca9945867
4 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/sch_edit_frame.cpp
View File

@ -1646,9 +1646,6 @@ void SCH_EDIT_FRAME::SetScreen( BASE_SCREEN* aScreen )
SCH_BASE_FRAME::SetScreen( aScreen );
GetCanvas()->DisplaySheet( static_cast<SCH_SCREEN*>( aScreen ) );
if( m_toolManager )
m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
}

15
eeschema/tools/ee_selection.cpp
View File

@ -115,18 +115,3 @@ BOX2I EE_SELECTION::GetBoundingBox() const
}
const std::vector<KIGFX::VIEW_ITEM*> EE_SELECTION::updateDrawList() const
{
std::vector<VIEW_ITEM*> items;
auto addItem =
[&]( EDA_ITEM* item )
{
items.push_back( item );
};
for( EDA_ITEM* item : m_items )
addItem( item );
return items;
}

2
eeschema/tools/ee_selection.h
View File

@ -50,8 +50,6 @@ public:
void SetScreen( SCH_SCREEN* aScreen ) { m_screen = aScreen; }
SCH_SCREEN* GetScreen() { return m_screen; }
const std::vector<KIGFX::VIEW_ITEM*> updateDrawList() const override;
};
#endif // EE_SELECTION_H

14
eeschema/tools/ee_selection_tool.cpp
View File

@ -1906,13 +1906,10 @@ void EE_SELECTION_TOOL::highlight( EDA_ITEM* aItem, int aMode, SELECTION* aGroup
} );
}
if( aGroup && aMode != BRIGHTENED )
getView()->Hide( aItem, true );
if( itemType == SCH_PIN_T || itemType == SCH_FIELD_T || itemType == SCH_SHEET_PIN_T )
getView()->Update( aItem->GetParent(), KIGFX::REPAINT );
getView()->Update( aItem->GetParent() );
else
getView()->Update( aItem, KIGFX::REPAINT );
getView()->Update( aItem );
}
@ -1926,9 +1923,6 @@ void EE_SELECTION_TOOL::unhighlight( EDA_ITEM* aItem, int aMode, SELECTION* aGro
// Lines need endpoints cleared here
if( aItem->Type() == SCH_LINE_T )
aItem->ClearFlags( STARTPOINT | ENDPOINT );
if( aMode != BRIGHTENED )
getView()->Hide( aItem, false );
}
else if( aMode == BRIGHTENED )
aItem->ClearBrightened();
@ -1951,9 +1945,9 @@ void EE_SELECTION_TOOL::unhighlight( EDA_ITEM* aItem, int aMode, SELECTION* aGro
}
if( itemType == SCH_PIN_T || itemType == SCH_FIELD_T || itemType == SCH_SHEET_PIN_T )
getView()->Update( aItem->GetParent(), KIGFX::REPAINT );
getView()->Update( aItem->GetParent() );
else
getView()->Update( aItem, KIGFX::REPAINT );
getView()->Update( aItem );
}