Set default size if a QWindow has no geometry

also extract two lines out of conditional branches

Change-Id: I2d4a5f6dd357d84df43acc0082f9621fb6609768

1 files changed, 5 insertions, 3 deletions

diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index a54979a2..33d13d77 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -169,7 +169,10 @@ void QWaylandWindow::initWindow()
     if (QScreen *s = window()->screen())
         setOrientationMask(s->orientationUpdateMask());
     setWindowFlags(window()->flags());
-    setGeometry_helper(window()->geometry());
+    if (window()->geometry().isEmpty())
+        setGeometry_helper(QRect(QPoint(), QSize(500,500)));
+    else
+        setGeometry_helper(window()->geometry());
     setMask(window()->mask());
     setWindowStateInternal(window()->windowState());
     handleContentOrientationChange(window()->contentOrientation());
@@ -385,11 +388,10 @@ void QWaylandWindow::setCanResize(bool canResize)
         }
         if (!mConfigure.isEmpty()) {
             doResize();
-            QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
         } else if (mResizeDirty) {
-            QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
             mResizeDirty = false;
         }
+        QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
     }
 }