From 0275356db6f8a7253d55553e119512c6347d7aa2 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 9 Oct 2024 17:51:52 +0200 Subject: [PATCH] Utils: Turn enum StyleHelper::ToolbarStyle into an enum class Needed later, to be able to forward declare it. Change-Id: I5ed13eb5dd9262a3a79457a012467906e1dd6399 Reviewed-by: Marcus Tillmanns --- src/libs/tracing/timelinetheme.cpp | 2 +- src/libs/utils/iconbutton.cpp | 2 +- src/libs/utils/passworddialog.cpp | 2 +- src/libs/utils/stylehelper.cpp | 4 ++-- src/libs/utils/stylehelper.h | 8 ++++---- src/plugins/coreplugin/generalsettings.cpp | 12 +++++++----- src/plugins/coreplugin/icore.cpp | 2 +- src/plugins/coreplugin/manhattanstyle.cpp | 8 ++++---- src/plugins/coreplugin/outputpanemanager.cpp | 5 +++-- .../styledbar/tst_manual_widgets_styledbar.cpp | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/libs/tracing/timelinetheme.cpp b/src/libs/tracing/timelinetheme.cpp index 41c0c44b4ff..bf47471f249 100644 --- a/src/libs/tracing/timelinetheme.cpp +++ b/src/libs/tracing/timelinetheme.cpp @@ -95,7 +95,7 @@ void TimelineTheme::setupTheme(QQmlEngine *engine) bool TimelineTheme::compactToolbar() const { - return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact; + return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact; } int TimelineTheme::toolBarHeight() const diff --git a/src/libs/utils/iconbutton.cpp b/src/libs/utils/iconbutton.cpp index 88270a43e34..fec2edf83f2 100644 --- a/src/libs/utils/iconbutton.cpp +++ b/src/libs/utils/iconbutton.cpp @@ -52,7 +52,7 @@ QSize IconButton::sizeHint() const { QSize s = icon().actualSize(QSize(32, 16)) + QSize(8, 8); - if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleRelaxed) + if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Relaxed) s += QSize(5, 5); return s; diff --git a/src/libs/utils/passworddialog.cpp b/src/libs/utils/passworddialog.cpp index 94de5f7f0f7..6e20f78690a 100644 --- a/src/libs/utils/passworddialog.cpp +++ b/src/libs/utils/passworddialog.cpp @@ -62,7 +62,7 @@ QSize ShowPasswordButton::sizeHint() const { QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(QSize(32, 16)) + QSize(8, 8); - if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleRelaxed) + if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Relaxed) s += QSize(5, 5); return s; diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index cf58073b05b..a9327a663d9 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -82,7 +82,7 @@ QColor StyleHelper::toolBarDropShadowColor() int StyleHelper::navigationWidgetHeight() { - return s_toolbarStyle == ToolbarStyleCompact ? 24 : 30; + return s_toolbarStyle == ToolbarStyle::Compact ? 24 : 30; } void StyleHelper::setToolbarStyle(ToolbarStyle style) @@ -478,7 +478,7 @@ void StyleHelper::drawMinimalArrow(QStyle::PrimitiveElement element, QPainter *p void StyleHelper::drawPanelBgRect(QPainter *painter, const QRectF &rect, const QBrush &brush) { - if (toolbarStyle() == ToolbarStyleCompact) { + if (toolbarStyle() == ToolbarStyle::Compact) { painter->fillRect(rect.toRect(), brush); } else { constexpr int margin = 2; diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h index e427f97514c..cb7775c1a64 100644 --- a/src/libs/utils/stylehelper.h +++ b/src/libs/utils/stylehelper.h @@ -73,11 +73,11 @@ namespace SpacingTokens { constexpr int ExVPaddingGapXl = 24; } -enum ToolbarStyle { - ToolbarStyleCompact, - ToolbarStyleRelaxed, +enum class ToolbarStyle { + Compact, + Relaxed, }; -constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyleCompact; +constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyle::Compact; // Keep in sync with: // SyleHelper::uiFontMetrics, ICore::uiConfigInformation, tst_manual_widgets_uifonts::main diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index fee5108fc01..8e42090b687 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -386,15 +386,17 @@ StyleHelper::ToolbarStyle toolbarStylefromSettings() return StyleHelper::defaultToolbarStyle; return StyleHelper::ToolbarStyle( - ICore::settings()->value(settingsKeyToolbarStyle, - StyleHelper::defaultToolbarStyle).toInt()); + ICore::settings()->value(settingsKeyToolbarStyle, + int(StyleHelper::defaultToolbarStyle)).toInt()); } void GeneralSettingsWidget::fillToolbarStyleBox() const { - m_toolbarStyleBox->addItem(Tr::tr("Compact"), StyleHelper::ToolbarStyleCompact); - m_toolbarStyleBox->addItem(Tr::tr("Relaxed"), StyleHelper::ToolbarStyleRelaxed); - const int curId = m_toolbarStyleBox->findData(toolbarStylefromSettings()); + m_toolbarStyleBox->addItem(Tr::tr("Compact"), + QVariant::fromValue(StyleHelper::ToolbarStyle::Compact)); + m_toolbarStyleBox->addItem(Tr::tr("Relaxed"), + QVariant::fromValue(StyleHelper::ToolbarStyle::Relaxed)); + const int curId = m_toolbarStyleBox->findData(QVariant::fromValue(toolbarStylefromSettings())); m_toolbarStyleBox->setCurrentIndex(curId); } diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 3b1535201ef..59e5957e1a5 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -1001,7 +1001,7 @@ QString uiConfigInformation() info.append(QString("Theme: %1 \"%2\"\n").arg(creatorTheme()->id()) .arg(creatorTheme()->displayName())); const QString toolbarStyle = - StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact ? "Compact" : "Relaxed"; + StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact ? "Compact" : "Relaxed"; info.append(QString("Toolbar style: Utils::StyleHelper::ToolbarStyle%1\n").arg(toolbarStyle)); const QString policy = QVariant::fromValue(QApplication::highDpiScaleFactorRoundingPolicy()).toString(); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index a6c0be17172..3ac5562fcdf 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -306,13 +306,13 @@ void ManhattanStyle::polish(QWidget *widget) QFontMetrics(QApplication::font()).height()); if (qobject_cast(widget)) { widget->setMinimumWidth( - StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact ? 24 : 28); + StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact ? 24 : 28); widget->setAttribute(Qt::WA_Hover); widget->setMaximumHeight(height - 2); } else if (qobject_cast(widget)) { widget->setAttribute(Qt::WA_Hover); widget->setFixedHeight(height - (StyleHelper::toolbarStyle() - == StyleHelper::ToolbarStyleCompact ? 1 : 3)); + == StyleHelper::ToolbarStyle::Compact ? 1 : 3)); } else if (qobject_cast(widget) || qobject_cast(widget) || qobject_cast(widget)) { widget->setPalette(panelPalette(widget->palette(), lightColored(widget))); @@ -321,7 +321,7 @@ void ManhattanStyle::polish(QWidget *widget) widget->setFixedHeight(height); } else if (qobject_cast(widget)) { const bool flatAndNotCompact = - StyleHelper::toolbarStyle() != StyleHelper::ToolbarStyleCompact + StyleHelper::toolbarStyle() != StyleHelper::ToolbarStyle::Compact && creatorTheme()->flag(Theme::FlatToolBars); widget->setFixedHeight(height + (flatAndNotCompact ? 3 : 2)); } else if (qobject_cast(widget)) { @@ -726,7 +726,7 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element, if (pressed) { StyleHelper::drawPanelBgRect( painter, rect, creatorColor(Theme::FancyToolButtonSelectedColor)); - if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact + if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact && !creatorTheme()->flag(Theme::FlatToolBars)) { const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); painter->drawLine(borderRect.topLeft() + QPointF(1, 0), borderRect.topRight() - QPointF(1, 0)); diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 11f7404407e..23bb37d98ff 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -987,7 +987,7 @@ QSize OutputPaneToggleButton::sizeHint() const static QRect bgRect(const QRect &widgetRect) { // Removes/compensates the left and right margins of StyleHelper::drawPanelBgRect - return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact + return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact ? widgetRect : widgetRect.adjusted(-2, 0, 2, 0); } @@ -1115,7 +1115,8 @@ OutputPaneManageButton::OutputPaneManageButton() { setFocusPolicy(Qt::NoFocus); setCheckable(true); - setFixedWidth(StyleHelper::toolbarStyle() == Utils::StyleHelper::ToolbarStyleCompact ? 17 : 21); + setFixedWidth(StyleHelper::toolbarStyle() == Utils::StyleHelper::ToolbarStyle::Compact ? 17 + : 21); connect(this, &QToolButton::clicked, this, &OutputPaneManageButton::menuRequested); } diff --git a/tests/manual/widgets/styledbar/tst_manual_widgets_styledbar.cpp b/tests/manual/widgets/styledbar/tst_manual_widgets_styledbar.cpp index 413dc06b14e..64fc660983e 100644 --- a/tests/manual/widgets/styledbar/tst_manual_widgets_styledbar.cpp +++ b/tests/manual/widgets/styledbar/tst_manual_widgets_styledbar.cpp @@ -24,7 +24,7 @@ int main(int argc, char *argv[]) auto themeSelector = new ManualTest::ThemeSelector; - StyleHelper::setToolbarStyle(StyleHelper::ToolbarStyleRelaxed); + StyleHelper::setToolbarStyle(StyleHelper::ToolbarStyle::Relaxed); const Icon icon({ {":/utils/images/zoom.png", Theme::IconsBaseColor},