Merge lp:~tpeeters/ubuntu-ui-toolkit/hide-bars-mainview into lp:ubuntu-ui-toolkit

[Tim Peeters]

Detect interaction with contents (in order to close toolbar/tabbar) from Page to MainView.

Detect interaction with contents (in order to close toolbar/tabbar) from Page to MainView. It is better to do it there because the toolbar and header are more easily accessible.

This change was requested when discussing this MR: https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/tabbar-closes-toolbar/+merge/196536

It is better to have the closing of the tabbar/toolbar all in the same place (in the MainView) so it is not needed to find the bars and make connections in several different places. Also, an app typically has one MainView and many Pages, so moving the MouseArea to MainView reduces the number of MouseAreas.

[lp:~tpeeters/ubuntu-ui-toolkit/hide-bars-mainview]

862. By Tim Peeters on 2013-11-26

move contentsArea from Page to MainView

863. By Tim Peeters on 2013-11-26

remove z from contentsArea. No longer needed because it is defined after contents and before Toolbar and TabBar.

864. By Tim Peeters on 2013-11-26

check for another property of TabBar that we use

865. By Tim Peeters on 2013-11-26

tabBar is Item

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:862
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/268
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1141
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1124
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3692
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1803

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1320/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:865
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1323/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/271
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/271/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1020
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1144
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3695
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1806

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1323/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Neat clean-up there. And a nice bonus to get rid of the maxStackingOrder hack which I didn't even consider before.

It seems like the Jenkins failures are unrelated? autopilot passes for me so I'll Approve.

review: Approve

[lp:~tpeeters/ubuntu-ui-toolkit/hide-bars-mainview]

866. By Tim Peeters on 2013-11-27

empty commit to re-trigger jenkins

[Tim Peeters (tpeeters)]

All AP tests pass on my maguro, except for one textarea failure which is this bug: https://bugs.launchpad.net/ubuntu-keyboard/+bug/1255327

Tested apps on device, works good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:866
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/277
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1166
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1149
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3712
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1824

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1329/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-11-18 15:20:18 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-11-27 09:47:39 +0000
@@ -270,6 +270,26 @@
                     topMargin: -parent.y
                 }
             }
+
+            MouseArea {
+                id: contentsArea
+                anchors.fill: contents
+                // This mouse area will be on top of the page contents, but
+                // under the toolbar and header.
+                // It is used for detecting interaction with the page contents
+                // which can close the toolbar and take a tab bar out of selection mode.
+
+                onPressed: {
+                    mouse.accepted = false;
+                    if (!toolbarItem.locked) {
+                        toolbarItem.close();
+                        }
+                    if (headerItem.tabBar && !headerItem.tabBar.alwaysSelectionMode) {
+                        headerItem.tabBar.selectionMode = false;
+                    }
+                }
+                propagateComposedEvents: true
+            }
         }
 
         Toolbar {
@@ -287,6 +307,17 @@
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
+
+            property Item tabBar: null
+            Binding {
+                target: headerItem
+                property: "tabBar"
+                value: headerItem.contents
+                when: headerItem.contents &&
+                      headerItem.contents.hasOwnProperty("selectionMode") &&
+                      headerItem.contents.hasOwnProperty("alwaysSelectionMode") &&
+                      headerItem.contents.hasOwnProperty("selectedIndex")
+            }
         }
     }
 

=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2013-11-11 10:49:10 +0000
+++ modules/Ubuntu/Components/Page.qml	2013-11-27 09:47:39 +0000
@@ -148,11 +148,6 @@
     Object {
         id: internal
 
-        // A very large real number that is used as the z-value for an item
-        // that should go on top of its siblings.
-        // FIXME: Expose this variable to all components of the toolkit
-        property real maxStackingOrder: 200000
-
         UnityActions.ActionContext {
             id: actionContext
 
@@ -250,34 +245,4 @@
             }
         }
     }
-
-    MouseArea {
-        id: contentsArea
-        anchors.fill: page
-        z: internal.maxStackingOrder
-        // This mouse area will be on top of the page contents, but
-        // under the toolbar and header.
-        // It is used for detecting interaction with the page contents
-        // which can close the toolbar and take a tab bar out of selection mode.
-
-        property Toolbar toolbar: page.__propagated && page.__propagated.toolbar ?
-                                      page.__propagated.toolbar : null
-
-        property TabBar tabBar: page.__propagated && page.__propagated.header &&
-                                page.__propagated.header.contents &&
-                                page.__propagated.header.contents.hasOwnProperty("selectionMode") &&
-                                page.__propagated.header.contents.hasOwnProperty("alwaysSelectionMode") ?
-                                    page.__propagated.header.contents : null
-
-        onPressed: {
-            mouse.accepted = false;
-            if (contentsArea.toolbar && !toolbar.locked) {
-                contentsArea.toolbar.close();
-                }
-            if (contentsArea.tabBar && !contentsArea.tabBar.alwaysSelectionMode) {
-                contentsArea.tabBar.selectionMode = false;
-            }
-        }
-        propagateComposedEvents: true
-    }
 }