Merge lp:~kalikiana/ubuntu-ui-toolkit/windowmagic into lp:ubuntu-ui-toolkit

[Cris Dywan]

Track magic window with a property signal instead of defining it

[Tim Peeters (tpeeters)]

Can make __windowActive really internal by putting it inside an Item?

The functions can also be put inside the internal item.

review: Needs Fixing

[Tim Peeters (tpeeters)]

Code looks good.

review: Approve

[Pat McGowan (pat-mcgowan)]

Works on Mako in environment bug was reported against.

review: Approve (tested on device)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-10-31 16:19:41 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2013-11-15 12:22:48 +0000
@@ -91,21 +91,34 @@
 
     Component.onCompleted: orientationTransition.enabled = transitionEnabled
 
-    /*!
-      Technically 'window' is defined by QML automatically however this can
-      happen very late. We define it here so there's no race condition.
-     */
-    Window {
-        id: window
+    Object {
+        id: internal
+
+        /*!
+          'window' is defined by QML between startup and showing on the screen.
+          There is no signal for when it becomes available and re-declaring it is not safe.
+
+          http://qt-project.org/doc/qt-5.1/qtqml/qml-qtqml2-qt.html
+          http://qt-project.org/doc/qt-5.1/qtquick/qmlmodule-qtquick-window2-qtquick-window-2.html
+         */
+        property bool windowActive: typeof window != 'undefined'
+
+        /*!
+          Report the current orientation of the application via QWindow::contentOrientation.
+          http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
+         */
+        function applyOrientation() {
+            if (windowActive)
+                window.contentOrientation = Screen.orientation
+        }
+
+        onWindowActiveChanged: applyOrientation()
     }
 
     /*!
       \internal
-
-      Report the current orientation of the application via QWindow::contentOrientation.
-      http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
      */
-    onOrientationAngleChanged: window.contentOrientation = Screen.orientation
+    onOrientationAngleChanged: internal.applyOrientation()
 
     Item {
         id: stateWrapper