1 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientwindow.cpp b/src/plugins/platforms/mirclient/qmirclientwindow.cpp
index adc8ae652a..decd21516e 100644
--- a/src/plugins/platforms/mirclient/qmirclientwindow.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientwindow.cpp
@@ -516,7 +516,6 @@ UbuntuSurface::UbuntuSurface(QMirClientWindow *platformWindow, EGLDisplay displa
 
     // Assume that the buffer size matches the surface size at creation time
     mBufferSize = geom.size();
-    platformWindow->QPlatformWindow::setGeometry(geom);
     QWindowSystemInterface::handleGeometryChange(mWindow, geom);
 
     qCDebug(mirclient) << "Created surface with geometry:" << geom << "title:" << mWindow->title()
@@ -636,7 +635,6 @@ void UbuntuSurface::onSwapBuffersDone()
         QRect newGeometry = mPlatformWindow->geometry();
         newGeometry.setSize(mBufferSize);
 
-        mPlatformWindow->QPlatformWindow::setGeometry(newGeometry);
         QWindowSystemInterface::handleGeometryChange(mWindow, newGeometry);
     } else {
         qCDebug(mirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - buffer size (%d,%d)",
@@ -785,8 +783,16 @@ void QMirClientWindow::handleSurfaceStateChanged(Qt::WindowState state)
     QWindowSystemInterface::handleWindowStateChanged(window(), state);
 }
 
-void QMirClientWindow::setWindowState(Qt::WindowState state)
+void QMirClientWindow::setWindowState(Qt::WindowStates states)
 {
+    Qt::WindowState state = Qt::WindowNoState;
+    if (states & Qt::WindowMinimized)
+        state = Qt::WindowMinimized;
+    else if (states & Qt::WindowFullScreen)
+        state = Qt::WindowFullScreen;
+    else if (states & Qt::WindowMaximized)
+        state = Qt::WindowMaximized;
+
     QMutexLocker lock(&mMutex);
     qCDebug(mirclient, "setWindowState(window=%p, %s)", this, qtWindowStateToStr(state));