diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-04 10:32:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-04 08:42:01 +0000 |
| commit | 267c2c2a93eb3aa09b01f0fe383ee01a6fcdbec2 (patch) | |
| tree | a97f5e6be65f05f9afbe72e75333ea163097a1bc /src/widgets/styles/qfusionstyle.cpp | |
| parent | 22d43c9e51e377cbc00aee362a740ab578a8158b (diff) | |
QFusionStyle::drawPrimitive(): Use color in cache key of PE_PanelButtonCommand
Previously, only bool isDefault was used, which did not discriminate
changes in ButtonColor. Use the color name instead.
Task-number: QTBUG-59850
Change-Id: I1e006f98371a5f2039dcca1207addc0396e7c1e5
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 98d45587f0..19b1cc2c57 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -908,8 +908,6 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, return; } - BEGIN_STYLE_PIXMAPCACHE(QString::fromLatin1("pushbutton-%1").arg(isDefault)) - r = rect.adjusted(0, 1, -1, 0); bool isEnabled = option->state & State_Enabled; bool hasFocus = (option->state & State_HasFocus && option->state & State_KeyboardFocusChange); @@ -923,6 +921,9 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, if (isDefault) buttonColor = mergedColors(buttonColor, highlightedOutline.lighter(130), 90); + BEGIN_STYLE_PIXMAPCACHE(QStringLiteral("pushbutton-") + buttonColor.name(QColor::HexArgb)) + r = rect.adjusted(0, 1, -1, 0); + p->setRenderHint(QPainter::Antialiasing, true); p->translate(0.5, -0.5); |