feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Turn enum StyleHelper::ToolbarStyle into an enum class

Browse Source 
Needed later, to be able to forward declare it.

Change-Id: I5ed13eb5dd9262a3a79457a012467906e1dd6399
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Alessandro Portale
2024-10-09 17:51:52 +02:00
parent e91ddd753e
commit 0275356db6
10 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/tracing/timelinetheme.cpp
View File

@@ -95,7 +95,7 @@ void TimelineTheme::setupTheme(QQmlEngine *engine)
bool TimelineTheme::compactToolbar() const bool TimelineTheme::compactToolbar() const
{ {
return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact; return StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact;
} }
int TimelineTheme::toolBarHeight() const int TimelineTheme::toolBarHeight() const

2
src/libs/utils/iconbutton.cpp
View File

@@ -52,7 +52,7 @@ QSize IconButton::sizeHint() const
{ {
QSize s = icon().actualSize(QSize(32, 16)) + QSize(8, 8); 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); s += QSize(5, 5);
return s; return s;

2
src/libs/utils/passworddialog.cpp
View File

@@ -62,7 +62,7 @@ QSize ShowPasswordButton::sizeHint() const
{ {
QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(QSize(32, 16)) + QSize(8, 8); 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); s += QSize(5, 5);
return s; return s;

4
src/libs/utils/stylehelper.cpp
View File

@@ -82,7 +82,7 @@ QColor StyleHelper::toolBarDropShadowColor()
int StyleHelper::navigationWidgetHeight() int StyleHelper::navigationWidgetHeight()
{ {
return s_toolbarStyle == ToolbarStyleCompact ? 24 : 30; return s_toolbarStyle == ToolbarStyle::Compact ? 24 : 30;
} }
void StyleHelper::setToolbarStyle(ToolbarStyle style) 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) void StyleHelper::drawPanelBgRect(QPainter *painter, const QRectF &rect, const QBrush &brush)
{ {
if (toolbarStyle() == ToolbarStyleCompact) { if (toolbarStyle() == ToolbarStyle::Compact) {
painter->fillRect(rect.toRect(), brush); painter->fillRect(rect.toRect(), brush);
} else { } else {
constexpr int margin = 2; constexpr int margin = 2;

8
src/libs/utils/stylehelper.h
View File

@@ -73,11 +73,11 @@ namespace SpacingTokens {
constexpr int ExVPaddingGapXl = 24; constexpr int ExVPaddingGapXl = 24;
} }
enum ToolbarStyle { enum class ToolbarStyle {
ToolbarStyleCompact, Compact,
ToolbarStyleRelaxed, Relaxed,
}; };
constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyleCompact; constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyle::Compact;
// Keep in sync with: // Keep in sync with:
// SyleHelper::uiFontMetrics, ICore::uiConfigInformation, tst_manual_widgets_uifonts::main // SyleHelper::uiFontMetrics, ICore::uiConfigInformation, tst_manual_widgets_uifonts::main

10
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -387,14 +387,16 @@ StyleHelper::ToolbarStyle toolbarStylefromSettings()
return StyleHelper::ToolbarStyle( return StyleHelper::ToolbarStyle(
ICore::settings()->value(settingsKeyToolbarStyle, ICore::settings()->value(settingsKeyToolbarStyle,
StyleHelper::defaultToolbarStyle).toInt()); int(StyleHelper::defaultToolbarStyle)).toInt());
} }
void GeneralSettingsWidget::fillToolbarStyleBox() const void GeneralSettingsWidget::fillToolbarStyleBox() const
{ {
m_toolbarStyleBox->addItem(Tr::tr("Compact"), StyleHelper::ToolbarStyleCompact); m_toolbarStyleBox->addItem(Tr::tr("Compact"),
m_toolbarStyleBox->addItem(Tr::tr("Relaxed"), StyleHelper::ToolbarStyleRelaxed); QVariant::fromValue(StyleHelper::ToolbarStyle::Compact));
const int curId = m_toolbarStyleBox->findData(toolbarStylefromSettings()); m_toolbarStyleBox->addItem(Tr::tr("Relaxed"),
QVariant::fromValue(StyleHelper::ToolbarStyle::Relaxed));
const int curId = m_toolbarStyleBox->findData(QVariant::fromValue(toolbarStylefromSettings()));
m_toolbarStyleBox->setCurrentIndex(curId); m_toolbarStyleBox->setCurrentIndex(curId);
} }

2
src/plugins/coreplugin/icore.cpp
View File

@@ -1001,7 +1001,7 @@ QString uiConfigInformation()
info.append(QString("Theme: %1 \"%2\"\n").arg(creatorTheme()->id()) info.append(QString("Theme: %1 \"%2\"\n").arg(creatorTheme()->id())
.arg(creatorTheme()->displayName())); .arg(creatorTheme()->displayName()));
const QString toolbarStyle = 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)); info.append(QString("Toolbar style: Utils::StyleHelper::ToolbarStyle%1\n").arg(toolbarStyle));
const QString policy = const QString policy =
QVariant::fromValue(QApplication::highDpiScaleFactorRoundingPolicy()).toString(); QVariant::fromValue(QApplication::highDpiScaleFactorRoundingPolicy()).toString();

8
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -306,13 +306,13 @@ void ManhattanStyle::polish(QWidget *widget)
QFontMetrics(QApplication::font()).height()); QFontMetrics(QApplication::font()).height());
if (qobject_cast<QToolButton*>(widget)) { if (qobject_cast<QToolButton*>(widget)) {
widget->setMinimumWidth( widget->setMinimumWidth(
StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact ? 24 : 28); StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact ? 24 : 28);
widget->setAttribute(Qt::WA_Hover); widget->setAttribute(Qt::WA_Hover);
widget->setMaximumHeight(height - 2); widget->setMaximumHeight(height - 2);
} else if (qobject_cast<QLineEdit*>(widget)) { } else if (qobject_cast<QLineEdit*>(widget)) {
widget->setAttribute(Qt::WA_Hover); widget->setAttribute(Qt::WA_Hover);
widget->setFixedHeight(height - (StyleHelper::toolbarStyle() widget->setFixedHeight(height - (StyleHelper::toolbarStyle()
== StyleHelper::ToolbarStyleCompact ? 1 : 3)); == StyleHelper::ToolbarStyle::Compact ? 1 : 3));
} else if (qobject_cast<QLabel*>(widget) || qobject_cast<QSpinBox*>(widget) } else if (qobject_cast<QLabel*>(widget) || qobject_cast<QSpinBox*>(widget)
|| qobject_cast<QCheckBox*>(widget)) { || qobject_cast<QCheckBox*>(widget)) {
widget->setPalette(panelPalette(widget->palette(), lightColored(widget))); widget->setPalette(panelPalette(widget->palette(), lightColored(widget)));
@@ -321,7 +321,7 @@ void ManhattanStyle::polish(QWidget *widget)
widget->setFixedHeight(height); widget->setFixedHeight(height);
} else if (qobject_cast<QStatusBar*>(widget)) { } else if (qobject_cast<QStatusBar*>(widget)) {
const bool flatAndNotCompact = const bool flatAndNotCompact =
StyleHelper::toolbarStyle() != StyleHelper::ToolbarStyleCompact StyleHelper::toolbarStyle() != StyleHelper::ToolbarStyle::Compact
&& creatorTheme()->flag(Theme::FlatToolBars); && creatorTheme()->flag(Theme::FlatToolBars);
widget->setFixedHeight(height + (flatAndNotCompact ? 3 : 2)); widget->setFixedHeight(height + (flatAndNotCompact ? 3 : 2));
} else if (qobject_cast<QComboBox*>(widget)) { } else if (qobject_cast<QComboBox*>(widget)) {
@@ -726,7 +726,7 @@ void ManhattanStyle::drawPrimitiveForPanelWidget(PrimitiveElement element,
if (pressed) { if (pressed) {
StyleHelper::drawPanelBgRect( StyleHelper::drawPanelBgRect(
painter, rect, creatorColor(Theme::FancyToolButtonSelectedColor)); painter, rect, creatorColor(Theme::FancyToolButtonSelectedColor));
if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleCompact if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyle::Compact
&& !creatorTheme()->flag(Theme::FlatToolBars)) { && !creatorTheme()->flag(Theme::FlatToolBars)) {
const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); 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)); painter->drawLine(borderRect.topLeft() + QPointF(1, 0), borderRect.topRight() - QPointF(1, 0));

5
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -987,7 +987,7 @@ QSize OutputPaneToggleButton::sizeHint() const
static QRect bgRect(const QRect &widgetRect) static QRect bgRect(const QRect &widgetRect)
{ {
// Removes/compensates the left and right margins of StyleHelper::drawPanelBgRect // 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); ? widgetRect : widgetRect.adjusted(-2, 0, 2, 0);
} }
@@ -1115,7 +1115,8 @@ OutputPaneManageButton::OutputPaneManageButton()
{ {
setFocusPolicy(Qt::NoFocus); setFocusPolicy(Qt::NoFocus);
setCheckable(true); 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); connect(this, &QToolButton::clicked, this, &OutputPaneManageButton::menuRequested);
} }

2
tests/manual/widgets/styledbar/tst_manual_widgets_styledbar.cpp
View File

@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
auto themeSelector = new ManualTest::ThemeSelector; auto themeSelector = new ManualTest::ThemeSelector;
StyleHelper::setToolbarStyle(StyleHelper::ToolbarStyleRelaxed); StyleHelper::setToolbarStyle(StyleHelper::ToolbarStyle::Relaxed);
const Icon icon({ const Icon icon({
{":/utils/images/zoom.png", Theme::IconsBaseColor}, {":/utils/images/zoom.png", Theme::IconsBaseColor},