diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-17 15:33:46 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-20 14:19:47 +0000 |
commit | 3e5d5852ddc45201e721ec513fbc37745c98a78a (patch) | |
tree | aeff854ef538944e0382fc20d849345a76cc48d6 | |
parent | 8d1fc3ca4d3a27b1ed5d1b8de4023aad9b629f61 (diff) |
windowflags: Update preview info when window state changes
Change-Id: I072939cdff0bd58779d9c163cb23e8176f3bc84a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r-- | tests/manual/windowflags/previewwindow.cpp | 42 | ||||
-rw-r--r-- | tests/manual/windowflags/previewwindow.h | 6 |
2 files changed, 28 insertions, 20 deletions
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp index 54084fd1bc..65a287f788 100644 --- a/tests/manual/windowflags/previewwindow.cpp +++ b/tests/manual/windowflags/previewwindow.cpp @@ -202,16 +202,21 @@ PreviewWindow::PreviewWindow(QWidget *parent) setWindowTitle(tr("Preview <QWidget> Qt %1").arg(QLatin1String(QT_VERSION_STR))); } -void PreviewWindow::resizeEvent(QResizeEvent *e) +bool PreviewWindow::event(QEvent *event) { - QWidget::resizeEvent(e); - updateInfo(); -} + const bool ret = QWidget::event(event); -void PreviewWindow::moveEvent(QMoveEvent *e) -{ - QWidget::moveEvent(e); - updateInfo(); + switch (event->type()) { + case QEvent::Move: + case QEvent::Resize: + case QEvent::WindowStateChange: + updateInfo(); + break; + default: + break; + } + + return ret; } void PreviewWindow::setWindowFlags(Qt::WindowFlags flags) @@ -234,16 +239,21 @@ PreviewDialog::PreviewDialog(QWidget *parent) setWindowTitle(tr("Preview <QDialog> Qt %1").arg(QLatin1String(QT_VERSION_STR))); } -void PreviewDialog::resizeEvent(QResizeEvent *e) +bool PreviewDialog::event(QEvent *event) { - QDialog::resizeEvent(e); - updateInfo(); -} + const bool ret = QDialog::event(event); -void PreviewDialog::moveEvent(QMoveEvent *e) -{ - QDialog::moveEvent(e); - updateInfo(); + switch (event->type()) { + case QEvent::Move: + case QEvent::Resize: + case QEvent::WindowStateChange: + updateInfo(); + break; + default: + break; + } + + return ret; } void PreviewDialog::setWindowFlags(Qt::WindowFlags flags) diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h index acd79735ad..9730e7a3f9 100644 --- a/tests/manual/windowflags/previewwindow.h +++ b/tests/manual/windowflags/previewwindow.h @@ -48,8 +48,7 @@ public slots: void updateInfo(); protected: - void resizeEvent(QResizeEvent *); - void moveEvent(QMoveEvent *); + bool event(QEvent *) override; private: QPlainTextEdit *textEdit; @@ -68,8 +67,7 @@ public slots: void updateInfo(); protected: - void resizeEvent(QResizeEvent *); - void moveEvent(QMoveEvent *); + bool event(QEvent *) override; private: QPlainTextEdit *textEdit; |