1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Q(Quick)Window on eglfs

Browse Source 
The call to QPlatformWindow::setRect (for storing into d->rect) was
in the wrong place. It has to be the potentially-overridden value.

Amends 3a31c708790ba2bb3cf3dab32a17a83659a1acde

Task-number: QTBUG-57608
Change-Id: Id3c35e2dc178f7bd2f9643e8ae4754c8f2f39240
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Laszlo Agocs 2017-08-02 14:31:36 +02:00
parent d12d2949d1
commit 51446c3c6f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/eglfs/api/qeglfswindow.cpp
View File

@ -235,18 +235,15 @@ void QEglFSWindow::setVisible(bool visible)
void QEglFSWindow::setGeometry(const QRect &r)
{
// Persist the requested rect, like a normal setGeometry call
QPlatformWindow::setGeometry(r);
// Take care of WM behavior, constrain/modify geometry
QRect rect = r;
if (m_flags.testFlag(HasNativeWindow))
rect = screen()->availableGeometry();
// React to the setGeometry, as if from a WM callback
QRect lastReportedGeometry = qt_window_private(window())->geometry;
QPlatformWindow::setGeometry(rect);
QWindowSystemInterface::handleGeometryChange(window(), rect);
const QRect lastReportedGeometry = qt_window_private(window())->geometry;
if (rect != lastReportedGeometry)
QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), rect.size()));
}