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

Properties: Use insertion order as display order

This commit is contained in:
Jon Evans 2022-12-04 17:20:34 -05:00
parent fc062e8a19
commit a8cb0ee116
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/properties/property_mgr.cpp
View File

@ -136,6 +136,7 @@ void PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wxString& aG
TYPE_ID hash = aProperty->OwnerHash();
CLASS_DESC& classDesc = getClass( hash );
classDesc.m_ownProperties.emplace( name, aProperty );
classDesc.m_ownDisplayOrder.emplace_back( aProperty );
aProperty->SetGroup( aGroup );
@ -301,9 +302,8 @@ void PROPERTY_MANAGER::CLASS_DESC::collectPropsRecur( PROPERTY_LIST& aResult,
int idx = 0;
for( const std::pair<const wxString, std::unique_ptr<PROPERTY_BASE>>& prop : m_ownProperties )
for( PROPERTY_BASE* property : m_ownDisplayOrder )
{
PROPERTY_BASE* property = prop.second.get();
PROPERTY_SET::key_type propertyKey = std::make_pair( property->OwnerHash(),
property->Name() );
// Do not store replaced properties

6
include/properties/property_mgr.h
View File

@ -252,10 +252,16 @@ private:
///< All properties (both unique to the type and inherited)
std::vector<PROPERTY_BASE*> m_allProperties;
///< Compiled display order for all properties
PROPERTY_DISPLAY_ORDER m_displayOrder;
///< List of property groups provided by this class in display order
std::vector<wxString> m_groupDisplayOrder;
///< Non-owning list of classes's direct properties in display order
std::vector<PROPERTY_BASE*> m_ownDisplayOrder;
///< The property groups provided by this class
std::set<wxString> m_groups;
///< Replaced properties (TYPE_ID / name)