diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-17 13:16:48 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-19 05:12:33 +0200 |
commit | 86d973ed077b3e8e89571b2c3327f15d3ad89eed (patch) | |
tree | 7328335f9a6f8972a7fa74ba5967d1ef9977d390 /src/widgets | |
parent | 6b2cc49580bab245e970d5162207fb0086a2750c (diff) |
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 <doris.verria@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/widgets/qcommandlinkbutton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |