diff options
Diffstat (limited to 'src/gui/kernel/qscreen_p.h')
-rw-r--r-- | src/gui/kernel/qscreen_p.h | 74 |
1 files changed, 22 insertions, 52 deletions
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 7543202c2f..964bc1cc58 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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 QSCREEN_P_H #define QSCREEN_P_H @@ -60,21 +24,8 @@ QT_BEGIN_NAMESPACE -class QScreenPrivate : public QObjectPrivate +struct QScreenData { - Q_DECLARE_PUBLIC(QScreen) -public: - void setPlatformScreen(QPlatformScreen *screen); - void updateHighDpi() - { - geometry = platformScreen->deviceIndependentGeometry(); - availableGeometry = QHighDpi::fromNative(platformScreen->availableGeometry(), QHighDpiScaling::factor(platformScreen), geometry.topLeft()); - } - - void updatePrimaryOrientation(); - void updateGeometriesWithSignals(); - void emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged); - QPlatformScreen *platformScreen = nullptr; Qt::ScreenOrientation orientation = Qt::PrimaryOrientation; @@ -85,6 +36,25 @@ public: qreal refreshRate = 60; }; +class QScreenPrivate : public QObjectPrivate, public QScreenData +{ + Q_DECLARE_PUBLIC(QScreen) +public: + void updateGeometry(); + void updatePrimaryOrientation(); + + class UpdateEmitter + { + public: + explicit UpdateEmitter(QScreen *screen); + ~UpdateEmitter(); + UpdateEmitter(UpdateEmitter&&) noexcept = default; + private: + Q_DISABLE_COPY(UpdateEmitter) + QScreenData initialState; + }; +}; + QT_END_NAMESPACE #endif // QSCREEN_P_H |