Skip to content

Commit

Permalink
Minor improvements of windows style
Browse files Browse the repository at this point in the history 
1. Make some global constants constexpr.
2. Make some file-scope global constants static.
3. Use QStringLiteral instead of plain const char*
4. Add "u" to QStringLiteral's content.

Pick-to: 6.8
Change-Id: Icbc105366ba40e970b256fe3da41231a6fb5064b
Reviewed-by: Christian Ehrlicher <[email protected]>
(cherry picked from commit ad06099)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
  • Loading branch information
@wangwenx190
wangwenx190 authored and Qt Cherry-pick Bot committed Dec 10, 2024
1 parent 1a73708 commit 7c3723b
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 39 deletions.
56 changes: 28 additions & 28 deletions src/plugins/styles/modernwindows/qwindows11style.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

QT_BEGIN_NAMESPACE

const static int topLevelRoundingRadius = 8; //Radius for toplevel items like popups for round corners
const static int secondLevelRoundingRadius = 4; //Radius for second level items like hovered menu item round corners
constexpr QLatin1StringView originalWidthProperty("_q_windows11_style_original_width");
static constexpr int topLevelRoundingRadius = 8; //Radius for toplevel items like popups for round corners
static constexpr int secondLevelRoundingRadius = 4; //Radius for second level items like hovered menu item round corners
static constexpr QLatin1StringView originalWidthProperty("_q_windows11_style_original_width");

enum WINUI3Color {
subtleHighlightColor, //Subtle highlight based on alpha used for hovered elements
Expand All @@ -57,7 +57,7 @@ enum WINUI3Color {
textAccentDisabled
};

const static QColor WINUI3ColorsLight [] {
static const QColor WINUI3ColorsLight [] {
QColor(0x00,0x00,0x00,0x09), //subtleHighlightColor
QColor(0x00,0x00,0x00,0x06), //subtlePressedColor
QColor(0x00,0x00,0x00,0x0F), //frameColorLight
Expand All @@ -78,7 +78,7 @@ const static QColor WINUI3ColorsLight [] {
QColor(0xFF,0xFF,0xFF,0xFF), //textAccentDisabled
};

const static QColor WINUI3ColorsDark[] {
static const QColor WINUI3ColorsDark[] {
QColor(0xFF,0xFF,0xFF,0x0F), //subtleHighlightColor
QColor(0xFF,0xFF,0xFF,0x0A), //subtlePressedColor
QColor(0xFF,0xFF,0xFF,0x12), //frameColorLight
Expand All @@ -99,12 +99,12 @@ const static QColor WINUI3ColorsDark[] {
QColor(0xFF,0xFF,0xFF,0x87), //textAccentDisabled
};

const static QColor* WINUI3Colors[] {
static const QColor* WINUI3Colors[] {
WINUI3ColorsLight,
WINUI3ColorsDark
};

const QColor shellCloseButtonColor(0xC4,0x2B,0x1C,0xFF); //Color of close Button in Titlebar
static const QColor shellCloseButtonColor(0xC4,0x2B,0x1C,0xFF); //Color of close Button in Titlebar

#if QT_CONFIG(toolbutton)
static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbutton,
Expand Down Expand Up @@ -467,7 +467,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
QRectF rect = proxy()->subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget).adjusted(4, 0, -4, 1);
painter->setFont(assetFont);
painter->setPen(combobox->palette.text().color());
painter->drawText(rect,"\uE70D", Qt::AlignVCenter | Qt::AlignHCenter);
painter->drawText(rect, QStringLiteral(u"\uE70D"), Qt::AlignVCenter | Qt::AlignHCenter);
}
if (combobox->editable) {
QColor lineColor = state & State_HasFocus ? option->palette.accent().color() : QColor(0,0,0);
Expand Down Expand Up @@ -530,7 +530,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
f.setPointSize(6);
cp->setFont(f);
cp->setPen(Qt::gray);
const auto str = vertical ? QStringLiteral("\uEDDC") : QStringLiteral("\uEDDA");
const auto str = vertical ? QStringLiteral(u"\uEDDC") : QStringLiteral(u"\uEDDA");
cp->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter);
}
}
Expand All @@ -541,7 +541,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
f.setPointSize(6);
cp->setFont(f);
cp->setPen(Qt::gray);
const auto str = vertical ? QStringLiteral("\uEDDB") : QStringLiteral("\uEDD9");
const auto str = vertical ? QStringLiteral(u"\uEDDB") : QStringLiteral(u"\uEDD9");
cp->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter);
}
}
Expand All @@ -558,7 +558,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
bool hover = closeButtonRect.contains(mousePos);
if (hover)
painter->fillRect(closeButtonRect,shellCloseButtonColor);
const QString textToDraw("\uE8BB");
const QString textToDraw(QStringLiteral(u"\uE8BB"));
painter->setPen(QPen(hover ? option->palette.highlightedText().color() : option->palette.text().color()));
painter->setFont(buttonFont);
painter->drawText(closeButtonRect, Qt::AlignVCenter | Qt::AlignHCenter, textToDraw);
Expand All @@ -570,7 +570,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
bool hover = normalButtonRect.contains(mousePos);
if (hover)
painter->fillRect(normalButtonRect,WINUI3Colors[colorSchemeIndex][subtleHighlightColor]);
const QString textToDraw("\uE923");
const QString textToDraw(QStringLiteral(u"\uE923"));
painter->setPen(QPen(option->palette.text().color()));
painter->setFont(buttonFont);
painter->drawText(normalButtonRect, Qt::AlignVCenter | Qt::AlignHCenter, textToDraw);
Expand All @@ -582,7 +582,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
bool hover = minButtonRect.contains(mousePos);
if (hover)
painter->fillRect(minButtonRect,WINUI3Colors[colorSchemeIndex][subtleHighlightColor]);
const QString textToDraw("\uE921");
const QString textToDraw(QStringLiteral(u"\uE921"));
painter->setPen(QPen(option->palette.text().color()));
painter->setFont(buttonFont);
painter->drawText(minButtonRect, Qt::AlignVCenter | Qt::AlignHCenter, textToDraw);
Expand Down Expand Up @@ -630,39 +630,39 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
// min button
if (shouldDrawButton(SC_TitleBarMinButton, Qt::WindowMinimizeButtonHint) &&
!(titlebar->titleBarState & Qt::WindowMinimized)) {
drawButton(SC_TitleBarMinButton, QStringLiteral("\uE921"));
drawButton(SC_TitleBarMinButton, QStringLiteral(u"\uE921"));
}

// max button
if (shouldDrawButton(SC_TitleBarMaxButton, Qt::WindowMaximizeButtonHint) &&
!(titlebar->titleBarState & Qt::WindowMaximized)) {
drawButton(SC_TitleBarMaxButton, QStringLiteral("\uE922"));
drawButton(SC_TitleBarMaxButton, QStringLiteral(u"\uE922"));
}

// close button
if (shouldDrawButton(SC_TitleBarCloseButton, Qt::WindowSystemMenuHint))
drawButton(SC_TitleBarCloseButton, QStringLiteral("\uE8BB"), shellCloseButtonColor);
drawButton(SC_TitleBarCloseButton, QStringLiteral(u"\uE8BB"), shellCloseButtonColor);

// normalize button
if ((titlebar->subControls & SC_TitleBarNormalButton) &&
(((titlebar->titleBarFlags & Qt::WindowMinimizeButtonHint) &&
(titlebar->titleBarState & Qt::WindowMinimized)) ||
((titlebar->titleBarFlags & Qt::WindowMaximizeButtonHint) &&
(titlebar->titleBarState & Qt::WindowMaximized)))) {
drawButton(SC_TitleBarNormalButton, QStringLiteral("\uE923"));
drawButton(SC_TitleBarNormalButton, QStringLiteral(u"\uE923"));
}

// context help button
if (shouldDrawButton(SC_TitleBarContextHelpButton, Qt::WindowContextHelpButtonHint))
drawButton(SC_TitleBarContextHelpButton, QStringLiteral("\uE897"));
drawButton(SC_TitleBarContextHelpButton, QStringLiteral(u"\uE897"));

// shade button
if (shouldDrawButton(SC_TitleBarShadeButton, Qt::WindowShadeButtonHint))
drawButton(SC_TitleBarShadeButton, QStringLiteral("\uE96D"));
drawButton(SC_TitleBarShadeButton, QStringLiteral(u"\uE96D"));

// unshade button
if (shouldDrawButton(SC_TitleBarUnshadeButton, Qt::WindowShadeButtonHint))
drawButton(SC_TitleBarUnshadeButton, QStringLiteral("\uE96E"));
drawButton(SC_TitleBarUnshadeButton, QStringLiteral(u"\uE96E"));

// window icon for system menu
if (shouldDrawButton(SC_TitleBarSysMenu, Qt::WindowSystemMenuHint)) {
Expand Down Expand Up @@ -799,9 +799,9 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
painter->setPen(header->palette.text().color());
QRectF rect = option->rect;
if (header->sortIndicator & QStyleOptionHeader::SortUp) {
painter->drawText(rect,Qt::AlignCenter,"\uE96D");
painter->drawText(rect, Qt::AlignCenter, QStringLiteral(u"\uE96D"));
} else if (header->sortIndicator & QStyleOptionHeader::SortDown) {
painter->drawText(rect,Qt::AlignCenter,"\uE96E");
painter->drawText(rect, Qt::AlignCenter, QStringLiteral(u"\uE96E"));
}
}
break;
Expand All @@ -817,7 +817,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
rect.moveCenter(center);

float clipWidth = animation != nullptr ? animation->currentValue() : 1.0f;
QRectF clipRect = fm.boundingRect("\uE73E");
QRectF clipRect = fm.boundingRect(QStringLiteral(u"\uE73E"));
clipRect.moveCenter(center);
clipRect.setLeft(rect.x() + (rect.width() - clipRect.width()) / 2.0);
clipRect.setWidth(clipWidth * clipRect.width());
Expand All @@ -834,9 +834,9 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
painter->setPen(option->palette.highlightedText().color());
painter->setBrush(option->palette.highlightedText());
if (option->state & State_On)
painter->drawText(clipRect, Qt::AlignVCenter | Qt::AlignLeft,"\uE73E");
painter->drawText(clipRect, Qt::AlignVCenter | Qt::AlignLeft, QStringLiteral(u"\uE73E"));
else if (option->state & State_NoChange)
painter->drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter,"\uE73C");
painter->drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter, QStringLiteral(u"\uE73C"));
}
break;
case PE_IndicatorBranch: {
Expand Down Expand Up @@ -944,7 +944,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
break;
}
case PE_PanelLineEdit:
if (widget && widget->objectName() == "qt_spinbox_lineedit")
if (widget && widget->objectName() == QStringLiteral(u"qt_spinbox_lineedit"))
break;
if (const auto *panel = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
QRectF frameRect = option->rect;
Expand Down Expand Up @@ -1373,7 +1373,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
menuSplitter = QLineF(indicatorRect.topRight(),indicatorRect.bottomRight());
textRect = textRect.adjusted(indicatorSize, 0, 0, 0);
}
painter->drawText(indicatorRect,"\uE70D",Qt::AlignVCenter|Qt::AlignHCenter);
painter->drawText(indicatorRect, QStringLiteral(u"\uE70D"), Qt::AlignVCenter | Qt::AlignHCenter);
painter->setPen(QPen(WINUI3Colors[colorSchemeIndex][controlStrokePrimary]));
painter->drawLine(menuSplitter);
}
Expand Down Expand Up @@ -1548,7 +1548,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
painter->setPen(menuitem->palette.text().color());
painter->setFont(assetFont);
const int text_flags = Qt::AlignVCenter | Qt::AlignHCenter | Qt::TextDontClip | Qt::TextSingleLine;
const auto textToDraw = QStringLiteral("\uE73E");
const auto textToDraw = QStringLiteral(u"\uE73E");
painter->setPen(option->palette.text().color());
painter->drawText(vCheckRect, text_flags, textToDraw);
painter->restore();
Expand Down
22 changes: 11 additions & 11 deletions src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ QT_BEGIN_NAMESPACE

using namespace Qt::StringLiterals;

static const int windowsItemFrame = 2; // menu item frame width
static const int windowsItemHMargin = 3; // menu item hor text margin
static const int windowsItemVMargin = 4; // menu item ver text margin
static const int windowsArrowHMargin = 6; // arrow horizontal margin
static const int windowsRightBorder = 15; // right border on windows
static constexpr int windowsItemFrame = 2; // menu item frame width
static constexpr int windowsItemHMargin = 3; // menu item hor text margin
static constexpr int windowsItemVMargin = 4; // menu item ver text margin
static constexpr int windowsArrowHMargin = 6; // arrow horizontal margin
static constexpr int windowsRightBorder = 15; // right border on windows

#ifndef TMT_CONTENTMARGINS
# define TMT_CONTENTMARGINS 3602
Expand Down Expand Up @@ -106,8 +106,8 @@ static inline HWND createTreeViewHelperWindow(const QScreen *screen)

HWND result = nullptr;
if (auto nativeWindowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration()))
result = nativeWindowsApp->createMessageWindow(QStringLiteral("QTreeViewThemeHelperWindowClass"),
QStringLiteral("QTreeViewThemeHelperWindow"));
result = nativeWindowsApp->createMessageWindow(QStringLiteral(u"QTreeViewThemeHelperWindowClass"),
QStringLiteral(u"QTreeViewThemeHelperWindow"));
const auto topLeft = screen->geometry().topLeft();
// make it a top-level window and move it the the correct screen to paint with the correct dpr later on
SetParent(result, NULL);
Expand Down Expand Up @@ -750,7 +750,7 @@ bool QWindowsVistaStylePrivate::drawBackgroundThruNativeBuffer(QWindowsThemeData
bool partIsTransparent;
bool potentialInvalidAlpha;

QString pixmapCacheKey = QStringLiteral("$qt_xp_");
QString pixmapCacheKey = QStringLiteral(u"$qt_xp_");
pixmapCacheKey.append(themeName(themeData.theme));
pixmapCacheKey.append(QLatin1Char('p'));
pixmapCacheKey.append(QString::number(partId));
Expand Down Expand Up @@ -2112,7 +2112,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt

if (hover || selected) {
if (sectionSize.width() > 0 && sectionSize.height() > 0) {
QString key = QString::fromLatin1("qvdelegate-%1-%2-%3-%4-%5").arg(sectionSize.width())
QString key = QStringLiteral(u"qvdelegate-%1-%2-%3-%4-%5").arg(sectionSize.width())
.arg(sectionSize.height()).arg(selected).arg(active).arg(hover);
if (!QPixmapCache::find(key, &pixmap)) {
pixmap = QPixmap(sectionSize);
Expand Down Expand Up @@ -2697,7 +2697,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
option->rect, animRect);
pixmapSize.setWidth(animRect.width());
}
QString name = QString::fromLatin1("qiprogress-%1-%2").arg(pixmapSize.width()).arg(pixmapSize.height());
QString name = QStringLiteral(u"qiprogress-%1-%2").arg(pixmapSize.width()).arg(pixmapSize.height());
QPixmap pixmap;
if (!QPixmapCache::find(name, &pixmap)) {
QImage image(pixmapSize, QImage::Format_ARGB32);
Expand Down Expand Up @@ -4807,7 +4807,7 @@ void QWindowsVistaStyle::polish(QApplication *app)
{
// Override windows theme palettes to light
if (qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark) {
static const char* themedWidgets[] = {
static constexpr const char* themedWidgets[] = {
"QToolButton",
"QAbstractButton",
"QCheckBox",
Expand Down

0 comments on commit 7c3723b

Please sign in to comment.