From 5ba9c07dddc354c6904a9522fc4fed666aa315a0 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Mon, 16 Apr 2012 20:19:12 +0000 Subject: [PATCH] Handle window state changes correctly in EGLFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only valid state for EGLFS is fullscreen; this change reduces EGLFS to reflect this cruel reality Change-Id: I5aa9b4ef88451a00ce9de328add7d5512e1c86b5 Reviewed-by: Samuel Rødal --- src/plugins/platforms/eglfs/qeglfswindow.cpp | 11 +++++++---- src/plugins/platforms/eglfs/qeglfswindow.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp index f380542559..e9430eae40 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp @@ -54,10 +54,7 @@ QEglFSWindow::QEglFSWindow(QWindow *w) qWarning("QEglWindow %p: %p 0x%x\n", this, w, uint(m_winid)); #endif - QRect screenGeometry(screen()->availableGeometry()); - if (w->geometry() != screenGeometry) { - QWindowSystemInterface::handleGeometryChange(w, screenGeometry); - } + setWindowState(Qt::WindowFullScreen); } void QEglFSWindow::setGeometry(const QRect &) @@ -69,6 +66,12 @@ void QEglFSWindow::setGeometry(const QRect &) QPlatformWindow::setGeometry(rect); } +Qt::WindowState QEglFSWindow::setWindowState(Qt::WindowState state) +{ + setGeometry(QRect()); + return Qt::WindowFullScreen; +} + WId QEglFSWindow::winId() const { return m_winid; diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index 1376708ad6..7f40c78550 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -56,6 +56,7 @@ public: QEglFSWindow(QWindow *w); void setGeometry(const QRect &); + Qt::WindowState setWindowState(Qt::WindowState state); WId winId() const; private: