Merge lp:~dandrader/qtubuntu/enhancePanelHack into lp:qtubuntu

[Daniel d'Andrada]

Update panel height hack when window enters or leaves fullscreen

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/283/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/74/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/283/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM!

review: Approve

[Florian Boucault (fboucault)]

review: Approve

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-11-17 13:42:24 +0000
+++ src/ubuntumirclient/window.cpp	2015-11-27 12:52:29 +0000
@@ -261,7 +261,11 @@
         auto geom = mWindow->geometry();
         geom.setWidth(parameters.width);
         geom.setHeight(parameters.height);
-        geom.setY(panelHeight());
+        if (mWindowState == Qt::WindowFullScreen) {
+            geom.setY(0);
+        } else {
+            geom.setY(panelHeight());
+        }
 
         // Assume that the buffer size matches the surface size at creation time
         mBufferSize = geom.size();
@@ -542,6 +546,27 @@
     QMutexLocker lock(&mMutex);
     DLOG("[ubuntumirclient QPA] setWindowState(window=%p, %s)", this, qtWindowStateToStr(state));
     mSurface->setState(state);
+
+    updatePanelHeightHack(state);
+}
+
+/*
+    FIXME: Mir does not let clients know the position of their windows in the virtual
+    desktop space. So we have this ugly hack that assumes a phone situation where the
+    window is always on the top-left corner, right below the indicators panel if not
+    in fullscreen.
+ */
+void UbuntuWindow::updatePanelHeightHack(Qt::WindowState state)
+{
+    if (state == Qt::WindowFullScreen && geometry().y() != 0) {
+        QRect newGeometry = geometry();
+        newGeometry.setY(0);
+        QWindowSystemInterface::handleGeometryChange(window(), newGeometry);
+    } else if (geometry().y() == 0) {
+        QRect newGeometry = geometry();
+        newGeometry.setY(panelHeight());
+        QWindowSystemInterface::handleGeometryChange(window(), newGeometry);
+    }
 }
 
 void UbuntuWindow::setGeometry(const QRect& rect)

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2015-11-17 13:42:24 +0000
+++ src/ubuntumirclient/window.h	2015-11-27 12:52:29 +0000
@@ -54,6 +54,7 @@
     void onSwapBuffersDone();
 
 private:
+    void updatePanelHeightHack(Qt::WindowState);
     mutable QMutex mMutex;
     const WId mId;
     const QSharedPointer<UbuntuClipboard> mClipboard;