Merge lp:~nick-dedekind/qtubuntu/1616968-position-shift into lp:qtubuntu

[Nick Dedekind]

Fixed panel position shifting and initial surface exposure.

Fixed panel position shifting and initial surface exposure.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:339
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/111/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2683
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2711
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2584
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2584
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2584
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2577/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2577
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2577/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/111/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Looks good to me.

review: Approve

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-08-09 23:00:32 +0000
+++ src/ubuntumirclient/window.cpp	2016-08-26 13:19:15 +0000
@@ -347,9 +347,9 @@
         geom.setWidth(parameters.width);
         geom.setHeight(parameters.height);
         if (mWindow->windowState() == Qt::WindowFullScreen) {
-            geom.setY(0);
+            geom.moveTop(0);
         } else {
-            geom.setY(panelHeight());
+            geom.moveTop(panelHeight());
         }
 
         // Assume that the buffer size matches the surface size at creation time
@@ -584,16 +584,17 @@
     , mWindowState(w->windowState())
     , mWindowFlags(w->flags())
     , mWindowVisible(false)
-    , mWindowExposed(true)
     , mNativeInterface(native)
     , mSurface(new UbuntuSurface{this, eglDisplay, input, mirConnection})
     , mScale(1.0)
     , mFormFactor(mir_form_factor_unknown)
 {
+    mWindowExposed = mSurface->mNeedsExposeCatchup == false;
+
     qCDebug(ubuntumirclient, "UbuntuWindow(window=%p, screen=%p, input=%p, surf=%p) with title '%s', role: '%d'",
             w, w->screen()->handle(), input, mSurface.get(), qPrintable(window()->title()), roleFor(window()));
 
-    updatePanelHeightHack(w->windowState() != Qt::WindowFullScreen);
+    updatePanelHeightHack(mSurface->state() != mir_surface_state_fullscreen);
 }
 
 UbuntuWindow::~UbuntuWindow()
@@ -703,9 +704,9 @@
 
     QRect newGeometry = geometry();
     if (enable) {
-        newGeometry.setY(panelHeight());
+        newGeometry.moveTop(panelHeight());
     } else {
-        newGeometry.setY(0);
+        newGeometry.moveTop(0);
     }
 
     if (newGeometry != geometry()) {
@@ -772,7 +773,8 @@
 
 bool UbuntuWindow::isExposed() const
 {
-    return mWindowVisible && mWindowExposed;
+    // mNeedsExposeCatchup because we need to render a frame to get the expose surface event from mir.
+    return mWindowVisible && (mWindowExposed || (mSurface && mSurface->mNeedsExposeCatchup));
 }
 
 QSurfaceFormat UbuntuWindow::format() const