diff options
Diffstat (limited to 'src/gui/kernel/qpaintdevicewindow.cpp')
-rw-r--r-- | src/gui/kernel/qpaintdevicewindow.cpp | 70 |
1 files changed, 22 insertions, 48 deletions
diff --git a/src/gui/kernel/qpaintdevicewindow.cpp b/src/gui/kernel/qpaintdevicewindow.cpp index 4f45fc5fde..9e8c6ae5a8 100644 --- a/src/gui/kernel/qpaintdevicewindow.cpp +++ b/src/gui/kernel/qpaintdevicewindow.cpp @@ -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 #include "qpaintdevicewindow_p.h" @@ -44,6 +8,12 @@ QT_BEGIN_NAMESPACE +QPaintDeviceWindowPrivate::QPaintDeviceWindowPrivate() + = default; + +QPaintDeviceWindowPrivate::~QPaintDeviceWindowPrivate() + = default; + /*! \class QPaintDeviceWindow \inmodule QtGui @@ -178,16 +148,7 @@ int QPaintDeviceWindow::metric(PaintDeviceMetric metric) const */ void QPaintDeviceWindow::exposeEvent(QExposeEvent *exposeEvent) { - Q_UNUSED(exposeEvent); - Q_D(QPaintDeviceWindow); - if (isExposed()) { - d->markWindowAsDirty(); - // Do not rely on exposeEvent->region() as it has some issues for the - // time being, namely that it is sometimes in local coordinates, - // sometimes relative to the parent, depending on the platform plugin. - // We require local coords here. - d->doFlush(QRect(QPoint(0, 0), size())); - } + QWindow::exposeEvent(exposeEvent); } /*! @@ -201,6 +162,17 @@ bool QPaintDeviceWindow::event(QEvent *event) if (handle()) // platform window may be gone when the window is closed during app exit d->handleUpdateEvent(); return true; + } else if (event->type() == QEvent::Paint) { + d->markWindowAsDirty(); + // Do not rely on exposeEvent->region() as it has some issues for the + // time being, namely that it is sometimes in local coordinates, + // sometimes relative to the parent, depending on the platform plugin. + // We require local coords here. + auto region = QRect(QPoint(0, 0), size()); + d->doFlush(region); // Will end up calling paintEvent + return true; + } else if (event->type() == QEvent::Resize) { + d->handleResizeEvent(); } return QWindow::event(event); @@ -223,3 +195,5 @@ QPaintEngine *QPaintDeviceWindow::paintEngine() const } QT_END_NAMESPACE + +#include "moc_qpaintdevicewindow.cpp" |