diff options
Diffstat (limited to 'src/gui/kernel/qscreen.h')
| -rw-r--r-- | src/gui/kernel/qscreen.h | 64 |
1 files changed, 17 insertions, 47 deletions
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 88925ab731..9442e7525b 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.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_H #define QSCREEN_H @@ -50,6 +14,7 @@ #include <QtGui/QTransform> #include <QtCore/qnamespace.h> +#include <QtCore/qnativeinterface.h> QT_BEGIN_NAMESPACE @@ -80,16 +45,20 @@ class Q_GUI_EXPORT QScreen : public QObject Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged) Q_PROPERTY(QRect virtualGeometry READ virtualGeometry NOTIFY virtualGeometryChanged) - Q_PROPERTY(QRect availableVirtualGeometry READ availableVirtualGeometry NOTIFY virtualGeometryChanged) + Q_PROPERTY(QRect availableVirtualGeometry READ availableVirtualGeometry + NOTIFY virtualGeometryChanged) Q_PROPERTY(QSizeF physicalSize READ physicalSize NOTIFY physicalSizeChanged) - Q_PROPERTY(qreal physicalDotsPerInchX READ physicalDotsPerInchX NOTIFY physicalDotsPerInchChanged) - Q_PROPERTY(qreal physicalDotsPerInchY READ physicalDotsPerInchY NOTIFY physicalDotsPerInchChanged) + Q_PROPERTY(qreal physicalDotsPerInchX READ physicalDotsPerInchX + NOTIFY physicalDotsPerInchChanged) + Q_PROPERTY(qreal physicalDotsPerInchY READ physicalDotsPerInchY + NOTIFY physicalDotsPerInchChanged) Q_PROPERTY(qreal physicalDotsPerInch READ physicalDotsPerInch NOTIFY physicalDotsPerInchChanged) Q_PROPERTY(qreal logicalDotsPerInchX READ logicalDotsPerInchX NOTIFY logicalDotsPerInchChanged) Q_PROPERTY(qreal logicalDotsPerInchY READ logicalDotsPerInchY NOTIFY logicalDotsPerInchChanged) Q_PROPERTY(qreal logicalDotsPerInch READ logicalDotsPerInch NOTIFY logicalDotsPerInchChanged) Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY physicalDotsPerInchChanged) - Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged) + Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation + NOTIFY primaryOrientationChanged) Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged) Q_PROPERTY(Qt::ScreenOrientation nativeOrientation READ nativeOrientation) Q_PROPERTY(qreal refreshRate READ refreshRate NOTIFY refreshRateChanged) @@ -125,7 +94,7 @@ public: QRect availableGeometry() const; QList<QScreen *> virtualSiblings() const; - QScreen *virtualSiblingAt(const QPoint &point); + QScreen *virtualSiblingAt(QPoint point); QSize virtualSize() const; QRect virtualGeometry() const; @@ -137,9 +106,6 @@ public: Qt::ScreenOrientation orientation() const; Qt::ScreenOrientation nativeOrientation() const; - Qt::ScreenOrientations orientationUpdateMask() const; - void setOrientationUpdateMask(Qt::ScreenOrientations mask); - int angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b) const; QTransform transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target) const; QRect mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect) const; @@ -147,10 +113,12 @@ public: bool isPortrait(Qt::ScreenOrientation orientation) const; bool isLandscape(Qt::ScreenOrientation orientation) const; - QPixmap grabWindow(WId window, int x = 0, int y = 0, int w = -1, int h = -1); + QPixmap grabWindow(WId window = 0, int x = 0, int y = 0, int w = -1, int h = -1); qreal refreshRate() const; + QT_DECLARE_NATIVE_INTERFACE_ACCESSOR(QScreen) + Q_SIGNALS: void geometryChanged(const QRect &geometry); void availableGeometryChanged(const QRect &geometry); @@ -179,5 +147,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QScreen *); QT_END_NAMESPACE +#include <QtGui/qscreen_platform.h> + #endif // QSCREEN_H |