3 files changed, 22 insertions, 13 deletions

diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index ff2d4bd845f..98e51397c17 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -596,7 +596,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
             if (sub & SC_ComboBoxArrow) {
                 QRectF rect = proxy()->subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget);
                 painter->setFont(d->assetFont);
-                painter->setPen(controlTextColor(option));
+                painter->setPen(controlTextColor(option, true));
                 painter->drawText(rect, Qt::AlignCenter, fluentIcon(Icon::ChevronDownMed));
             }
             if (state & State_KeyboardFocusChange && hasFocus) {
@@ -887,7 +887,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
 
             if (isOn) {
                 painter->setFont(d->assetFont);
-                painter->setPen(controlTextColor(option, QPalette::Window));
+                painter->setPen(controlTextColor(option));
                 qreal clipWidth = 1.0;
                 const QString str = fluentIcon(Icon::AcceptMedium);
                 QFontMetrics fm(d->assetFont);
@@ -907,7 +907,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
                 QFont f(d->assetFont);
                 f.setPointSize(6);
                 painter->setFont(f);
-                painter->setPen(controlTextColor(option, QPalette::Window));
+                painter->setPen(controlTextColor(option));
                 painter->drawText(rect, Qt::AlignCenter, fluentIcon(Icon::Dash12));
             }
         }
@@ -1214,7 +1214,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
     case QStyle::CE_ComboBoxLabel:
 #if QT_CONFIG(combobox)
         if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
-            painter->setPen(controlTextColor(option));
+            painter->setPen(controlTextColor(option, true));
             QStyleOptionComboBox newOption = *cb;
             newOption.rect.adjust(4,0,-4,0);
             QCommonStyle::drawControl(element, &newOption, painter, widget);
@@ -2622,6 +2622,7 @@ void QWindows11Style::polish(QPalette& result)
     d->m_titleBarNormalIcon = QIcon();
     d->m_toolbarExtensionButton = QIcon();
     d->m_lineEditClearButton = QIcon();
+    d->m_tabCloseButton = QIcon();
 }
 
 QPixmap QWindows11Style::standardPixmap(StandardPixmap standardPixmap,
@@ -2662,6 +2663,14 @@ QIcon QWindows11Style::standardIcon(StandardPixmap standardIcon,
         }
         return d->m_toolbarExtensionButton;
     }
+    case SP_TabCloseButton: {
+        if (d->m_tabCloseButton.isNull()) {
+            auto e = new WinFontIconEngine(fluentIcon(Icon::ChromeClose), d->assetFont);
+            e->setScale(0.6);
+            d->m_tabCloseButton = QIcon(e);
+        }
+        return d->m_tabCloseButton;
+    }
     default:
         break;
     }
@@ -2737,7 +2746,7 @@ QBrush QWindows11Style::inputFillBrush(const QStyleOption *option, const QWidget
     return winUI3Color(fillControlDefault);
 }
 
-QColor QWindows11Style::controlTextColor(const QStyleOption *option, QPalette::ColorRole role) const
+QColor QWindows11Style::controlTextColor(const QStyleOption *option, bool ignoreIsChecked) const
 {
     using namespace StyleOptionHelper;
     static constexpr WINUI3Color colorEnums[2][4] = {
@@ -2750,12 +2759,9 @@ QColor QWindows11Style::controlTextColor(const QStyleOption *option, QPalette::C
     if (option->palette.isBrushSet(QPalette::Current, QPalette::ButtonText))
         return option->palette.buttonText().color();
 
-    const int colorIndex = isChecked(option) ? 1 : 0;
+    const int colorIndex = !ignoreIsChecked && 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;
+    return winUI3Color(colorEnums[colorIndex][int(state)]);
 }
 
 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 96c2c4136e0..43a344a6ac9 100644
--- a/src/plugins/styles/modernwindows/qwindows11style_p.h
+++ b/src/plugins/styles/modernwindows/qwindows11style_p.h
@@ -104,8 +104,7 @@ private:
     QBrush controlFillBrush(const QStyleOption *option, ControlType controlType) const;
     QBrush inputFillBrush(const QStyleOption *option, const QWidget *widget) const;
     // ControlType::ControlAlt can be mapped to QPalette directly
-    QColor controlTextColor(const QStyleOption *option,
-                            QPalette::ColorRole role = QPalette::ButtonText) const;
+    QColor controlTextColor(const QStyleOption *option, bool ignoreIsChecked = false) const;
     void drawLineEditFrame(QPainter *p, const QRectF &rect, const QStyleOption *o, bool isEditable = true) const;
     inline QColor winUI3Color(enum WINUI3Color col) const;
 
@@ -126,6 +125,7 @@ class QWindows11StylePrivate : public QWindowsVistaStylePrivate {
 protected:
     QIcon m_toolbarExtensionButton;
     QIcon m_lineEditClearButton;
+    QIcon m_tabCloseButton;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
index 64ffba2d6f8..36b5d0f0143 100644
--- a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
@@ -16,6 +16,9 @@
 #include <private/qapplication_p.h>
 #include <private/qsystemlibrary_p.h>
 #include <private/qwindowsthemecache_p.h>
+#if QT_CONFIG(tooltip)
+#include "private/qtooltip_p.h"
+#endif
 
 #include "qdrawutil.h" // for now
 #include <qbackingstore.h>
@@ -4676,7 +4679,7 @@ void QWindowsVistaStyle::polish(QWidget *widget)
                 widget->setPalette(pal);
         } else
 #endif // QT_CONFIG(commandlinkbutton)
-        if (widget->inherits("QTipLabel")) {
+        if (qobject_cast<const QTipLabel *>(widget)) {
             //note that since tooltips are not reused
             //we do not have to care about unpolishing
             widget->setContentsMargins(3, 0, 4, 0);