diff options
Diffstat (limited to 'src/quick/items/qquickpalettecolorprovider_p.h')
-rw-r--r-- | src/quick/items/qquickpalettecolorprovider_p.h | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/src/quick/items/qquickpalettecolorprovider_p.h b/src/quick/items/qquickpalettecolorprovider_p.h index 952c74aa0d..2a779f20d3 100644 --- a/src/quick/items/qquickpalettecolorprovider_p.h +++ b/src/quick/items/qquickpalettecolorprovider_p.h @@ -1,38 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICKPALETTECOLORPROVIDER_P_H #define QQUICKPALETTECOLORPROVIDER_P_H @@ -58,7 +25,7 @@ QT_BEGIN_NAMESPACE class QQuickAbstractPaletteProvider; -class Q_QUICK_PRIVATE_EXPORT QQuickPaletteColorProvider +class Q_QUICK_EXPORT QQuickPaletteColorProvider : public std::enable_shared_from_this<QQuickPaletteColorProvider> { public: @@ -67,6 +34,7 @@ public: const QColor &color(QPalette::ColorGroup group, QPalette::ColorRole role) const; bool setColor(QPalette::ColorGroup group, QPalette::ColorRole role, QColor color); bool resetColor(QPalette::ColorGroup group, QPalette::ColorRole role); + bool resetColor(QPalette::ColorGroup group); bool fromQPalette(QPalette p); QPalette palette() const; @@ -78,11 +46,16 @@ public: bool reset(); - bool inheritPalette(const QPalette &p); + bool inheritPalette(const QPalette &palette); private: + bool doInheritPalette(const QPalette &palette); + bool updateInheritedPalette(); + void ensureRequestedPalette(); + QPalette m_resolvedPalette; QLazilyAllocated<QPalette> m_requestedPalette; + QLazilyAllocated<QPalette> m_lastInheritedPalette; using Deleter = std::function<void(const QQuickAbstractPaletteProvider*)>; using ProviderPtr = std::unique_ptr<const QQuickAbstractPaletteProvider, Deleter>; |