diff options
author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-08-06 15:50:22 +0200 |
---|---|---|
committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-03-18 17:29:24 +0100 |
commit | 31f5c21ddb571d744efd1885c0687816b3a12225 (patch) | |
tree | 1e7ccb81c2db278ed265638eb25a69c546430575 /src/imports/controls/fusion/qquickfusionknob.cpp | |
parent | fccd63d1296a611a282ae15d0c437eb4b09e6eb1 (diff) |
Remove old QQuickPalette implementation
The existing implementation was removed in order to reduce massive code
duplication and simplify color resolving process. Unit tests were fixed
accordingly.
See related changes in the qtdeclarative module for the further details.
[ChangeLog][General] the palette API is a part of
QQuickItem now.
Change-Id: Ic94ab4632e626c11d9b26f035e2a8a119c9088ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/controls/fusion/qquickfusionknob.cpp')
-rw-r--r-- | src/imports/controls/fusion/qquickfusionknob.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/imports/controls/fusion/qquickfusionknob.cpp b/src/imports/controls/fusion/qquickfusionknob.cpp index 9f1824a6..a641d190 100644 --- a/src/imports/controls/fusion/qquickfusionknob.cpp +++ b/src/imports/controls/fusion/qquickfusionknob.cpp @@ -38,26 +38,15 @@ #include <QtCore/qmath.h> #include <QtGui/qpainter.h> +#include <QtQuick/private/qquickpalette_p.h> +#include <QtQuick/private/qquickitem_p.h> QT_BEGIN_NAMESPACE QQuickFusionKnob::QQuickFusionKnob(QQuickItem *parent) : QQuickPaintedItem(parent) { -} - -QPalette QQuickFusionKnob::palette() const -{ - return m_palette; -} - -void QQuickFusionKnob::setPalette(const QPalette &palette) -{ - if (palette == m_palette) - return; - - m_palette = palette; - update(); + connect(this, &QQuickItem::paletteChanged, this, [this](){ update(); }); } // extracted from QStyleHelper::drawDial() @@ -68,7 +57,7 @@ void QQuickFusionKnob::paint(QPainter *painter) if (w <= 0 || h <= 0) return; - QColor color = m_palette.color(QPalette::Button); + QColor color = QQuickItemPrivate::get(this)->palette()->button(); color.setHsv(color.hue(), qMin(140, color .saturation()), qMax(180, color.value())); |