diff options
Diffstat (limited to 'src/widgets/styles/qcommonstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qcommonstyle_p.h | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h index 6223a26a54..2fa90a8949 100644 --- a/src/widgets/styles/qcommonstyle_p.h +++ b/src/widgets/styles/qcommonstyle_p.h @@ -1,46 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 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 QCOMMONSTYLE_P_H #define QCOMMONSTYLE_P_H #include <QtWidgets/private/qtwidgetsglobal_p.h> +#include "qhash.h" #include "qcommonstyle.h" #include "qstyle_p.h" #if QT_CONFIG(animation) @@ -61,7 +26,6 @@ QT_BEGIN_NAMESPACE // We mean it. // -class QStringList; class QTextOption; // Private class @@ -112,7 +76,8 @@ public: && option.features == cachedOption->features && option.icon.isNull() == cachedOption->icon.isNull() && option.font == cachedOption->font - && option.viewItemPosition == cachedOption->viewItemPosition); + && option.viewItemPosition == cachedOption->viewItemPosition + && option.showDecorationSelected == cachedOption->showDecorationSelected); } #endif #if QT_CONFIG(toolbutton) @@ -127,13 +92,29 @@ public: int animationFps; #if QT_CONFIG(animation) - void _q_removeAnimation(); - - QList<const QObject*> animationTargets() const; QStyleAnimation* animation(const QObject *target) const; void startAnimation(QStyleAnimation *animation) const; void stopAnimation(const QObject *target) const; + void removeAnimation(const QObject *target) const; +#endif + QIcon iconFromWindowsTheme(QCommonStyle::StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const; + QIcon iconFromMacTheme(QCommonStyle::StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const; + QIcon iconFromApplicationTheme(QCommonStyle::StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const; + QIcon iconFromResourceTheme(QCommonStyle::StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const; + static bool inline rtl(const QStyleOption *option) { + return (option && option->direction == Qt::RightToLeft) || + (!option && QGuiApplication::isRightToLeft()); + } +#if QT_CONFIG(animation) private: mutable QHash<const QObject*, QStyleAnimation*> animations; #endif // animation |