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

QWaylandWindow: Add a missing shell surface null check.

Browse Source 
Caught by tst_QWidget::mapFromAndTo.

Change-Id: I36e08ebfa3bae1ac8667ee828b1762867d71c66d
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
This commit is contained in:
Robin Burchell 2014-08-17 13:58:02 +02:00
parent d9ba141df9
commit 223fc10cde
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -657,18 +657,21 @@ bool QWaylandWindow::setWindowStateInternal(Qt::WindowState state)
// here. We use then this mState variable. // here. We use then this mState variable.
mState = state; mState = state;
createDecoration(); createDecoration();
switch (state) {
case Qt::WindowFullScreen: if (mShellSurface) {
mShellSurface->setFullscreen(); switch (state) {
break; case Qt::WindowFullScreen:
case Qt::WindowMaximized: mShellSurface->setFullscreen();
mShellSurface->setMaximized(); break;
break; case Qt::WindowMaximized:
case Qt::WindowMinimized: mShellSurface->setMaximized();
mShellSurface->setMinimized(); break;
break; case Qt::WindowMinimized:
default: mShellSurface->setMinimized();
mShellSurface->setNormal(); break;
default:
mShellSurface->setNormal();
}
} }
QWindowSystemInterface::handleWindowStateChanged(window(), mState); QWindowSystemInterface::handleWindowStateChanged(window(), mState);