kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Reduce Linter warnings

Browse Source
This commit is contained in:
David Carter
2024-07-04 11:49:45 -04:00
parent 276d189254
commit e04d29b950
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Material/Gui/MaterialTreeWidget.cpp
View File

@@ -59,8 +59,9 @@ MaterialTreeWidget::MaterialTreeWidget(const std::shared_ptr<Materials::Material
QWidget* parent)
: QWidget(parent)
, m_expanded(false)
, m_treeSizeHint(250, 500)
, m_treeSizeHint(minimumTreeWidth, minimumTreeHeight)
, _filter(filter)
, _recentMax(defaultRecents)
{
setup();
}
@@ -70,9 +71,10 @@ MaterialTreeWidget::MaterialTreeWidget(
QWidget* parent)
: QWidget(parent)
, m_expanded(false)
, m_treeSizeHint(250, 500)
, m_treeSizeHint(minimumTreeWidth, minimumTreeHeight)
, _filter(std::make_shared<Materials::MaterialFilter>())
, _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<Materials::MaterialFilter>())
, _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<int>(param->GetInt("RecentMax", 5));
_recentMax = static_cast<int>(param->GetInt("RecentMax", defaultRecents));
auto count = param->GetInt("Recent", 0);
for (int i = 0; static_cast<long>(i) < count; i++) {
QString key = QString::fromLatin1("MRU%1").arg(i);

13
src/Mod/Material/Gui/MaterialTreeWidget.h
View File

@@ -96,7 +96,7 @@ public:
void setFilter(const std::shared_ptr<Materials::MaterialFilter>& filter);
void setFilter(
const std::shared_ptr<std::list<std::shared_ptr<Materials::MaterialFilter>>>& 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<ParameterGrp>& param);
void setFilterVisible(bool open);
void fillFilterCombo();
bool hasMultipleFilters() const {
bool hasMultipleFilters() const
{
return (_filterList && _filterList->size() > 1);
}
};