From 86d973ed077b3e8e89571b2c3327f15d3ad89eed Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 17 Jul 2022 13:16:48 +0200 Subject: QCommandLinkButton: Let the style set the text colors Make the hack less hacky by letting the style polish the widget (it does already for the font) to set a dynamic property that the button can test. Use the available palette entires ButtonText and BrightText to set the dark blue and bright blue colors, rather than hardcoding them in the widget code. Pick-to: 6.4 Change-Id: Idfb3b7d18e456a9d14af4962cf723e12ff1c3370 Reviewed-by: Doris Verria --- src/widgets/widgets/qcommandlinkbutton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/widgets/qcommandlinkbutton.cpp b/src/widgets/widgets/qcommandlinkbutton.cpp index 5a82e63f44..2c59e78c1a 100644 --- a/src/widgets/widgets/qcommandlinkbutton.cpp +++ b/src/widgets/widgets/qcommandlinkbutton.cpp @@ -171,7 +171,7 @@ bool QCommandLinkButtonPrivate::usingVistaStyle() const Q_Q(const QCommandLinkButton); //### This is a hack to detect if we are indeed running Vista style themed and not in classic // When we add api to query for this, we should change this implementation to use it. - return q->style()->inherits("QWindowsVistaStyle") + return q->property("_qt_usingVistaStyle").toBool() && q->style()->pixelMetric(QStyle::PM_ButtonShiftHorizontal, nullptr) == 0; } @@ -339,9 +339,9 @@ void QCommandLinkButton::paintEvent(QPaintEvent *) //Draw title QColor textColor = palette().buttonText().color(); if (isEnabled() && d->usingVistaStyle()) { - textColor = QColor(21, 28, 85); + textColor = option.palette.buttonText().color(); if (underMouse() && !isDown()) - textColor = QColor(7, 64, 229); + textColor = option.palette.brightText().color(); //A simple text color transition d->currentColor = d->mergedColors(textColor, d->currentColor, 60); option.palette.setColor(QPalette::ButtonText, d->currentColor); -- cgit v1.2.3