From e04d29b9506ef9823b1391b420a50aedf40ff1d9 Mon Sep 17 00:00:00 2001 From: David Carter Date: Thu, 4 Jul 2024 11:49:45 -0400 Subject: [PATCH] Reduce Linter warnings --- src/Mod/Material/Gui/MaterialTreeWidget.cpp | 15 +++++++++------ src/Mod/Material/Gui/MaterialTreeWidget.h | 13 +++++++++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 849d9d663f..edfb45198b 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -59,8 +59,9 @@ MaterialTreeWidget::MaterialTreeWidget(const std::shared_ptr()) , _filterList(filterList) + , _recentMax(defaultRecents) { setup(); } @@ -80,8 +82,9 @@ MaterialTreeWidget::MaterialTreeWidget( MaterialTreeWidget::MaterialTreeWidget(QWidget* parent) : QWidget(parent) , m_expanded(false) - , m_treeSizeHint(250, 500) + , m_treeSizeHint(minimumTreeWidth, minimumTreeHeight) , _filter(std::make_shared()) + , _recentMax(defaultRecents) { setup(); } @@ -110,7 +113,7 @@ QSize MaterialTreeWidget::sizeHint() const if (!m_expanded) { // When not expanded, the size height is the same as m_material QSize size = m_material->sizeHint(); - size.setWidth(250); + size.setWidth(minimumWidth); return size; } return QWidget::sizeHint(); @@ -397,7 +400,7 @@ void MaterialTreeWidget::setActiveFilter(const QString& name) // Save the library/folder expansion state saveMaterialTree(); - + updateMaterialTree(); return; } @@ -440,7 +443,7 @@ void MaterialTreeWidget::getRecents() auto param = App::GetApplication().GetParameterGroupByPath( "User parameter:BaseApp/Preferences/Mod/Material/Recent"); - _recentMax = static_cast(param->GetInt("RecentMax", 5)); + _recentMax = static_cast(param->GetInt("RecentMax", defaultRecents)); auto count = param->GetInt("Recent", 0); for (int i = 0; static_cast(i) < count; i++) { QString key = QString::fromLatin1("MRU%1").arg(i); diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.h b/src/Mod/Material/Gui/MaterialTreeWidget.h index 8ffeda1828..efdbf0e41e 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.h +++ b/src/Mod/Material/Gui/MaterialTreeWidget.h @@ -96,7 +96,7 @@ public: void setFilter(const std::shared_ptr& filter); void setFilter( const std::shared_ptr>>& filterList); - void setActiveFilter(const QString &name); + void setActiveFilter(const QString& name); void setExpanded(bool open); bool getExpanded() @@ -178,6 +178,14 @@ private Q_SLOTS: void onFilter(const QString& text); private: + // UI minimum sizes + static const int minimumWidth = 250; + static const int minimumTreeWidth = 250; + static const int minimumTreeHeight = 500; + + static const int defaultFavorites = 0; + static const int defaultRecents = 5; + void setup(); QLineEdit* m_material; @@ -254,7 +262,8 @@ protected: const Base::Reference& param); void setFilterVisible(bool open); void fillFilterCombo(); - bool hasMultipleFilters() const { + bool hasMultipleFilters() const + { return (_filterList && _filterList->size() > 1); } };