diff options
Diffstat (limited to 'src/quick/items/qquickpalette_p.h')
-rw-r--r-- | src/quick/items/qquickpalette_p.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/quick/items/qquickpalette_p.h b/src/quick/items/qquickpalette_p.h index ba93b867cc..3e40cf9036 100644 --- a/src/quick/items/qquickpalette_p.h +++ b/src/quick/items/qquickpalette_p.h @@ -16,20 +16,21 @@ #include <QtQuick/private/qquickcolorgroup_p.h> +#include <QtCore/qpointer.h> + #include <array> QT_BEGIN_NAMESPACE class QQuickAbstractPaletteProvider; -class Q_QUICK_PRIVATE_EXPORT QQuickPalette : public QQuickColorGroup +class Q_QUICK_EXPORT QQuickPalette : public QQuickColorGroup { Q_OBJECT - Q_PROPERTY(QQuickColorGroup *active READ active WRITE setActive NOTIFY activeChanged) - Q_PROPERTY(QQuickColorGroup *inactive READ inactive WRITE setInactive NOTIFY inactiveChanged) - Q_PROPERTY(QQuickColorGroup *disabled READ disabled WRITE setDisabled NOTIFY disabledChanged) - + Q_PROPERTY(QQuickColorGroup *active READ active WRITE setActive RESET resetActive NOTIFY activeChanged FINAL) + Q_PROPERTY(QQuickColorGroup *inactive READ inactive WRITE setInactive RESET resetInactive NOTIFY inactiveChanged FINAL) + Q_PROPERTY(QQuickColorGroup *disabled READ disabled WRITE setDisabled RESET resetDisabled NOTIFY disabledChanged FINAL) QML_NAMED_ELEMENT(Palette) QML_ADDED_IN_VERSION(6, 0) @@ -43,6 +44,9 @@ public: QQuickColorGroup *active() const; QQuickColorGroup *inactive() const; QQuickColorGroup *disabled() const; + void resetActive(); + void resetInactive(); + void resetDisabled(); QPalette::ColorGroup currentColorGroup() const override; void setCurrentGroup(QPalette::ColorGroup currentGroup); @@ -71,6 +75,7 @@ private: void setColorGroup(QPalette::ColorGroup groupTag, const QQuickColorGroup::GroupPtr &group, void (QQuickPalette::*notifier)()); + QQuickColorGroup::GroupPtr colorGroup(QPalette::ColorGroup groupTag) const; QQuickColorGroup::GroupPtr findColorGroup(QPalette::ColorGroup groupTag) const; @@ -88,6 +93,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPalette) - #endif // QQUICKPALETTE_H |