Merge lp:~phablet-team/qtubuntu/shellRotation into lp:qtubuntu

[Daniel d'Andrada]

Flip screen dimensions to compensate for a rotated window

And unify logging switch in input.cpp

Needed for shell rotation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/209/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Approving as per Gerry's review in
https://code.launchpad.net/~dandrader/qtubuntu/shellRotation/+merge/242215

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-20 12:37:32 +0000
+++ debian/changelog	2015-05-13 19:27:06 +0000
@@ -1,3 +1,9 @@
+qtubuntu (0.61) UNRELEASED; urgency=medium
+
+  * Flip screen dimensions to compensate for a rotated window
+
+ -- Daniel d'Andrada <[e-mail]>  Fri, 31 Oct 2014 16:39:11 -0200
+
 qtubuntu (0.60+15.04.20150318-0ubuntu3) vivid; urgency=medium
 
   * No-change rebuild against latest platform-api

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-02-17 17:39:47 +0000
+++ src/ubuntumirclient/input.cpp	2015-05-13 19:27:06 +0000
@@ -219,7 +219,14 @@
         break;
     case mir_event_type_resize:
     {
+        Q_ASSERT(ubuntuEvent->window->screen() == mIntegration->screen());
+
         auto resizeEvent = mir_event_get_resize_event(nativeEvent);
+
+        mIntegration->screen()->handleWindowSurfaceResize(
+                mir_resize_event_get_width(resizeEvent),
+                mir_resize_event_get_height(resizeEvent));
+
         ubuntuEvent->window->handleSurfaceResize(mir_resize_event_get_width(resizeEvent),
             mir_resize_event_get_height(resizeEvent));
         break;

=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2014-09-09 14:10:21 +0000
+++ src/ubuntumirclient/screen.cpp	2015-05-13 19:27:06 +0000
@@ -34,6 +34,24 @@
 static const int kSwapInterval = 1;
 
 #if !defined(QT_NO_DEBUG)
+
+static const char *orientationToStr(Qt::ScreenOrientation orientation) {
+    switch (orientation) {
+        case Qt::PrimaryOrientation:
+            return "primary";
+        case Qt::PortraitOrientation:
+            return "portrait";
+        case Qt::LandscapeOrientation:
+            return "landscape";
+        case Qt::InvertedPortraitOrientation:
+            return "inverted portrait";
+        case Qt::InvertedLandscapeOrientation:
+            return "inverted landscape";
+        default:
+            return "INVALID!";
+    }
+}
+
 static void printEglConfig(EGLDisplay display, EGLConfig config) {
   DASSERT(display != EGL_NO_DISPLAY);
   DASSERT(config != nullptr);
@@ -146,12 +164,11 @@
     ua_ui_display_destroy(display);
 
     mGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
-    mAvailableGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
 
     DLOG("QUbuntuScreen::QUbuntuScreen (this=%p)", this);
 
     // Set the default orientation based on the initial screen dimmensions.
-    mNativeOrientation = (mAvailableGeometry.width() >= mAvailableGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
+    mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
 
     // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
     mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
@@ -168,22 +185,22 @@
     OrientationChangeEvent* oReadingEvent = static_cast<OrientationChangeEvent*>(event);
     switch (oReadingEvent->mOrientation) {
         case QOrientationReading::LeftUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedPortraitOrientation : Qt::LandscapeOrientation;
             break;
         }
         case QOrientationReading::TopUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::LandscapeOrientation : Qt::PortraitOrientation;
             break;
         }
         case QOrientationReading::RightUp: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::PortraitOrientation : Qt::InvertedLandscapeOrientation;
             break;
         }
         case QOrientationReading::TopDown: {
-            mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ?
+            mCurrentOrientation = (screen()->primaryOrientation() == Qt::LandscapeOrientation) ?
                         Qt::InvertedLandscapeOrientation : Qt::InvertedPortraitOrientation;
             break;
         }
@@ -194,6 +211,39 @@
     }
 
     // Raise the event signal so that client apps know the orientation changed
+    DLOG("UbuntuScreen::customEvent - handling orientation change to %s", orientationToStr(mCurrentOrientation));
     QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
-    DLOG("UbuntuScreen::customEvent - handling orientation change to %d", mCurrentOrientation);
+}
+
+void UbuntuScreen::handleWindowSurfaceResize(int windowWidth, int windowHeight)
+{
+    if ((windowWidth > windowHeight && mGeometry.width() < mGeometry.height())
+     || (windowWidth < windowHeight && mGeometry.width() > mGeometry.height())) {
+
+        // The window aspect ratio differ's from the screen one. This means that
+        // unity8 has rotated the window in its scene.
+        // As there's no way to express window rotation in Qt's API, we have
+        // Flip QScreen's dimensions so that orientation properties match
+        // (primaryOrientation particularly).
+        // FIXME: This assumes a phone scenario. Won't work, or make sense,
+        //        on the desktop
+
+        QRect currGeometry = mGeometry;
+        mGeometry.setWidth(currGeometry.height());
+        mGeometry.setHeight(currGeometry.width());
+
+        DLOG("UbuntuScreen::handleWindowSurfaceResize - new screen geometry (w=%d, h=%d)",
+            mGeometry.width(), mGeometry.height());
+        QWindowSystemInterface::handleScreenGeometryChange(screen(),
+                                                           mGeometry /* newGeometry */,
+                                                           mGeometry /* newAvailableGeometry */);
+
+        if (mGeometry.width() < mGeometry.height()) {
+            mCurrentOrientation = Qt::PortraitOrientation;
+        } else {
+            mCurrentOrientation = Qt::LandscapeOrientation;
+        }
+        DLOG("UbuntuScreen::handleWindowSurfaceResize - new orientation %s",orientationToStr(mCurrentOrientation));
+        QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
+    }
 }

=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2014-08-25 15:24:02 +0000
+++ src/ubuntumirclient/screen.h	2015-05-13 19:27:06 +0000
@@ -32,7 +32,7 @@
     QImage::Format format() const override { return mFormat; }
     int depth() const override { return mDepth; }
     QRect geometry() const override { return mGeometry; }
-    QRect availableGeometry() const override { return mAvailableGeometry; }
+    QRect availableGeometry() const override { return mGeometry; }
     Qt::ScreenOrientation nativeOrientation() const override { return mNativeOrientation; }
     Qt::ScreenOrientation orientation() const override { return mNativeOrientation; }
 
@@ -41,13 +41,13 @@
     EGLDisplay eglDisplay() const { return mEglDisplay; }
     EGLConfig eglConfig() const { return mEglConfig; }
     EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
+    void handleWindowSurfaceResize(int width, int height);
 
     // QObject methods.
     void customEvent(QEvent* event);
 
 private:
     QRect mGeometry;
-    QRect mAvailableGeometry;
     Qt::ScreenOrientation mNativeOrientation;
     Qt::ScreenOrientation mCurrentOrientation;
     QImage::Format mFormat;