2 files changed, 45 insertions, 31 deletions
diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index 04b879c85ef..0ff4875293c 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -91,7 +91,7 @@ static constexpr int percentToAlpha(double percent)
     return qRound(percent * 255. / 100.);
 }
 
-static constexpr std::array<QColor, 30> WINUI3ColorsLight {
+static constexpr std::array<QColor, 32> WINUI3ColorsLight {
     QColor(0x00,0x00,0x00,0x09), //subtleHighlightColor
     QColor(0x00,0x00,0x00,0x06), //subtlePressedColor
     QColor(0x00,0x00,0x00,0x0F), //frameColorLight
@@ -101,13 +101,9 @@ static constexpr std::array<QColor, 30> WINUI3ColorsLight {
     QColor(0x00,0x00,0x00,0x29), //controlStrokeSecondary
     QColor(0x00,0x00,0x00,0x14), //controlStrokePrimary
     QColor(0xFF,0xFF,0xFF,0xFF), //menuPanelFill
-    QColor(0xFF,0xFF,0xFF,0xFF), //textOnAccentPrimary
-    QColor(0xFF,0xFF,0xFF,0x7F), //textOnAccentSecondary
-    QColor(0x00,0x00,0x00,0x7F), //controlTextSecondary
     QColor(0x00,0x00,0x00,0x66), //controlStrokeOnAccentSecondary
     QColor(0xFF,0xFF,0xFF,0xFF), //controlFillSolid
     QColor(0x75,0x75,0x75,0x66), //surfaceStroke
-    QColor(0xFF,0xFF,0xFF,0xFF), //textAccentDisabled
     QColor(0xFF,0xFF,0xFF,0xFF), //focusFrameInnerStroke
     QColor(0x00,0x00,0x00,0xFF), //focusFrameOuterStroke
     QColor(0xFF,0xFF,0xFF,percentToAlpha(70)),      // fillControlDefault
@@ -122,9 +118,15 @@ static constexpr std::array<QColor, 30> WINUI3ColorsLight {
     QColor(0x00,0x00,0x00,percentToAlpha(90)),      // fillAccentSecondary
     QColor(0x00,0x00,0x00,percentToAlpha(80)),      // fillAccentTertiary
     QColor(0x00,0x00,0x00,percentToAlpha(21.69)),   // fillAccentDisabled
+    QColor(0x00,0x00,0x00,percentToAlpha(89.56)),   // textPrimary
+    QColor(0x00,0x00,0x00,percentToAlpha(60.63)),   // textSecondary
+    QColor(0x00,0x00,0x00,percentToAlpha(36.14)),   // textDisabled
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(100)),     // textOnAccentPrimary
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(70)),      // textOnAccentSecondary
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(100)),     // textOnAccentDisabled
 };
 
-static constexpr std::array<QColor, 30> WINUI3ColorsDark {
+static constexpr std::array<QColor, 32> WINUI3ColorsDark {
     QColor(0xFF,0xFF,0xFF,0x0F), //subtleHighlightColor
     QColor(0xFF,0xFF,0xFF,0x0A), //subtlePressedColor
     QColor(0xFF,0xFF,0xFF,0x12), //frameColorLight
@@ -134,13 +136,9 @@ static constexpr std::array<QColor, 30> WINUI3ColorsDark {
     QColor(0xFF,0xFF,0xFF,0x18), //controlStrokeSecondary
     QColor(0xFF,0xFF,0xFF,0x12), //controlStrokePrimary
     QColor(0x0F,0x0F,0x0F,0xFF), //menuPanelFill
-    QColor(0x00,0x00,0x00,0xFF), //textOnAccentPrimary
-    QColor(0x00,0x00,0x00,0x80), //textOnAccentSecondary
-    QColor(0xFF,0xFF,0xFF,0x87), //controlTextSecondary
     QColor(0xFF,0xFF,0xFF,0x14), //controlStrokeOnAccentSecondary
     QColor(0x45,0x45,0x45,0xFF), //controlFillSolid
     QColor(0x75,0x75,0x75,0x66), //surfaceStroke
-    QColor(0xFF,0xFF,0xFF,0x87), //textAccentDisabled
     QColor(0x00,0x00,0x00,0xFF), //focusFrameInnerStroke
     QColor(0xFF,0xFF,0xFF,0xFF), //focusFrameOuterStroke
     QColor(0xFF,0xFF,0xFF,percentToAlpha(6.05)),    // fillControlDefault
@@ -155,9 +153,15 @@ static constexpr std::array<QColor, 30> WINUI3ColorsDark {
     QColor(0x00,0x00,0x00,percentToAlpha(90)),      // fillAccentSecondary
     QColor(0x00,0x00,0x00,percentToAlpha(80)),      // fillAccentTertiary
     QColor(0xFF,0xFF,0xFF,percentToAlpha(15.81)),   // fillAccentDisabled
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(100)),     // textPrimary
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(78.6)),    // textSecondary
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(36.28)),   // textDisabled
+    QColor(0x00,0x00,0x00,percentToAlpha(100)),     // textOnAccentPrimary
+    QColor(0x00,0x00,0x00,percentToAlpha(70)),      // textOnAccentSecondary
+    QColor(0xFF,0xFF,0xFF,percentToAlpha(53.02)),   // textOnAccentDisabled
 };
 
-static constexpr std::array<std::array<QColor,30>, 2> WINUI3Colors {
+static constexpr std::array<std::array<QColor,32>, 2> WINUI3Colors {
     WINUI3ColorsLight,
     WINUI3ColorsDark
 };
@@ -861,7 +865,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
 
             if (isOn) {
                 painter->setFont(d->assetFont);
-                painter->setPen(option->palette.color(QPalette::Window));
+                painter->setPen(controlTextColor(option, QPalette::Window));
                 QNumberStyleAnimation *animation = qobject_cast<QNumberStyleAnimation *>(
                         d->animation(option->styleObject));
                 QFontMetrics fm(d->assetFont);
@@ -873,7 +877,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
                 painter->drawText(clipRect, Qt::AlignVCenter | Qt::AlignLeft, QStringLiteral(u"\uE73E"));
             } else if (isPartial) {
                 painter->setFont(d->assetFont);
-                painter->setPen(option->palette.color(QPalette::Window));
+                painter->setPen(controlTextColor(option, QPalette::Window));
                 painter->drawText(rect, Qt::AlignCenter, QStringLiteral(u"\uE73C"));
             }
         }
@@ -1205,7 +1209,8 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
                 rect.translate(shiftX, shiftY);
                 painter->setFont(toolbutton->font);
                 const QString text = d->toolButtonElideText(toolbutton, rect, alignment);
-                painter->setPen(buttonLabelColor(option));
+                // option->state has no State_Sunken here, windowsvistastyle/CC_ToolButton removes it
+                painter->setPen(controlTextColor(option));
                 proxy()->drawItemText(painter, rect, alignment, toolbutton->palette,
                                       toolbutton->state & State_Enabled, text);
             } else {
@@ -1256,7 +1261,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
                     }
                     tr.translate(shiftX, shiftY);
                     const QString text = d->toolButtonElideText(toolbutton, tr, alignment);
-                    painter->setPen(buttonLabelColor(option));
+                    painter->setPen(controlTextColor(option));
                     proxy()->drawItemText(painter, QStyle::visualRect(toolbutton->direction, rect, tr), alignment, toolbutton->palette,
                                           toolbutton->state & State_Enabled, text);
                 } else {
@@ -1464,7 +1469,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
                 tf |= Qt::AlignHCenter;
             }
 
-            painter->setPen(buttonLabelColor(option));
+            painter->setPen(controlTextColor(option));
             proxy()->drawItemText(painter, textRect, tf, option->palette,btn->state & State_Enabled, btn->text);
         }
         break;
@@ -2471,20 +2476,25 @@ QBrush QWindows11Style::controlFillBrush(const QStyleOption *option, ControlType
     return winUI3Color(colorEnums[int(controlType)][int(state)]);
 }
 
-QColor QWindows11Style::buttonLabelColor(const QStyleOption *option) const
+QColor QWindows11Style::controlTextColor(const QStyleOption *option, QPalette::ColorRole role) const
 {
+    using namespace StyleOptionHelper;
+    static constexpr WINUI3Color colorEnums[2][int(ControlState::Max)] = {
+        // Control, unchecked
+        { textPrimary, textPrimary, textSecondary, textDisabled },
+        // Control, checked
+        { textOnAccentPrimary, textOnAccentPrimary, textOnAccentSecondary, textOnAccentDisabled },
+    };
+
     if (option->palette.isBrushSet(QPalette::Current, QPalette::ButtonText))
         return option->palette.buttonText().color();
 
-    const bool isOn = option->state & QStyle::State_On;
-    if (option->state & QStyle::State_Sunken)
-        return isOn ? winUI3Color(textOnAccentSecondary)
-                    : winUI3Color(controlTextSecondary);
-    if (!(option->state & QStyle::State_Enabled))
-        return isOn ? winUI3Color(textAccentDisabled)
-                    : option->palette.buttonText().color();
-    return isOn ? winUI3Color(textOnAccentPrimary)
-                : option->palette.buttonText().color();
+    const int colorIndex = isChecked(option) ? 1 : 0;
+    const auto state = calcControlState(option);
+    const auto alpha = winUI3Color(colorEnums[colorIndex][int(state)]);
+    QColor col = option->palette.color(role);
+    col.setAlpha(alpha.alpha());
+    return col;
 }
 
 void QWindows11Style::drawLineEditFrame(QPainter *p, const QRectF &rect, const QStyleOption *o, bool isEditable) const
diff --git a/src/plugins/styles/modernwindows/qwindows11style_p.h b/src/plugins/styles/modernwindows/qwindows11style_p.h
index 184a55eed3c..c645a3dce96 100644
--- a/src/plugins/styles/modernwindows/qwindows11style_p.h
+++ b/src/plugins/styles/modernwindows/qwindows11style_p.h
@@ -32,13 +32,9 @@ enum WINUI3Color {
     controlStrokeSecondary,
     controlStrokePrimary,
     menuPanelFill,                    //Color of menu panel
-    textOnAccentPrimary,              //Color of text on controls filled in accent color
-    textOnAccentSecondary,            //Color of text of sunken controls in accent color
-    controlTextSecondary,             //Color of text of sunken controls
     controlStrokeOnAccentSecondary,   //Color of frame around Buttons in accent color
     controlFillSolid,                 //Color for solid fill
     surfaceStroke,                    //Color of MDI window frames
-    textAccentDisabled,
     focusFrameInnerStroke,
     focusFrameOuterStroke,
     fillControlDefault,               // button default color (alpha)
@@ -53,6 +49,12 @@ enum WINUI3Color {
     fillAccentSecondary,              // button hover color (alpha)
     fillAccentTertiary,               // button pressed color (alpha)
     fillAccentDisabled,               // button disabled color (alpha)
+    textPrimary,                      // text of default/hovered control
+    textSecondary,                    // text of pressed control
+    textDisabled,                     // text of disabled control
+    textOnAccentPrimary,              // text of default/hovered control on accent color
+    textOnAccentSecondary,            // text of pressed control on accent color
+    textOnAccentDisabled,             // text of disabled control on accent color
 };
 
 class QWindows11Style : public QWindowsVistaStyle
@@ -93,7 +95,9 @@ private:
         ControlAlt
     };
     QBrush controlFillBrush(const QStyleOption *option, ControlType controlType) const;
-    QColor buttonLabelColor(const QStyleOption *option) const;
+    // ControlType::ControlAlt can be mapped to QPalette directly
+    QColor controlTextColor(const QStyleOption *option,
+                            QPalette::ColorRole role = QPalette::ButtonText) const;
     void drawLineEditFrame(QPainter *p, const QRectF &rect, const QStyleOption *o, bool isEditable = true) const;
     inline QColor winUI3Color(enum WINUI3Color col) const;