Merge lp:~tpeeters/ubuntu-ui-toolkit/popToTabs into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Use selectedIndex of the tabs model instead of the TabBar everywhere in TabBarStyle to fix a bug that uses Tabs on a PageStack.

[lp:~tpeeters/ubuntu-ui-toolkit/popToTabs]

1047. By Tim Peeters on 2014-05-09

revert test program to use new header

[Nekhelesh Ramananthan (nik90)]

I noticed this regression while testing on the clock app trunk. I can confirm that this MP fixes the issue during my testing. Poping a page from the pagestack now returns to the tab it was initially pushed from.

review: Approve (testing)

[Florian Boucault (fboucault)]

Well done.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1047
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/196/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/278
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/278/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/143
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/143/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/196/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-04-24 17:44:56 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2014-05-09 11:25:49 +0000
@@ -151,7 +151,7 @@
 
         if (model.count > 0) {
             if (internal.checkRoles()) {
-                model.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
+                model.selectedIndex = Math.max(Math.min(model.selectedIndex, model.count - 1), 0);
             }
         } else {
             internal.modelChecked = false;

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-24 17:44:56 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-05-09 11:25:49 +0000
@@ -59,7 +59,7 @@
       automaytically through ListModel changes.
       */
     function sync() {
-        buttonView.selectButton(styledItem.selectedIndex);
+        buttonView.selectButton(styledItem.model.selectedIndex);
     }
 
     property var tabsModel : styledItem ? styledItem.model : null
@@ -69,14 +69,14 @@
 
         onSelectionModeChanged: {
             if (!styledItem.selectionMode) {
-                buttonView.selectButton(styledItem.selectedIndex);
+                buttonView.selectButton(styledItem.model.selectedIndex);
             }
         }
     }
 
     Connections {
-        target: styledItem
-        onSelectedIndexChanged: buttonView.selectButton(styledItem.selectedIndex)
+        target: styledItem.model
+        onSelectedIndexChanged: buttonView.selectButton(styledItem.model.selectedIndex)
     }
 
     /*
@@ -126,7 +126,7 @@
                     // to avoid seeing fading animations of the unselected button when switching
                     // tabs from outside the tab bar.
                     property bool selected: (styledItem.selectionMode && buttonView.needsScrolling) ?
-                                                styledItem.selectedIndex === index :
+                                                styledItem.model.selectedIndex === index :
                                                 buttonView.selectedButtonIndex === button.buttonIndex
                     property real offset: theRow.rowNumber + 1 - button.x / theRow.width;
                     property int buttonIndex: index + theRow.rowNumber*repeater.count
@@ -171,9 +171,9 @@
                         // The indicator image must be visible after the selected tab button, when the
                         // tab bar is not in selection mode, or after the "last" button (starting with
                         // the selected one), when the tab bar is in selection mode.
-                        property bool isLastAfterSelected: index === (styledItem.selectedIndex === 0 ?
+                        property bool isLastAfterSelected: index === (styledItem.model.selectedIndex === 0 ?
                                                                           repeater.count-1 :
-                                                                          styledItem.selectedIndex - 1)
+                                                                          styledItem.model.selectedIndex - 1)
                         opacity: (styledItem.selectionMode ? isLastAfterSelected : selected) ? 1 : 0
                         Behavior on opacity {
                             NumberAnimation {

=== modified file 'tests/resources/navigation/StackWithTabs.qml'
--- tests/resources/navigation/StackWithTabs.qml	2014-04-28 15:39:24 +0000
+++ tests/resources/navigation/StackWithTabs.qml	2014-05-09 11:25:49 +0000
@@ -32,16 +32,6 @@
             Tab {
                 title: "Tab 1"
                 page: Page {
-                    Button {
-                        anchors.centerIn: parent
-                        onClicked: pageStack.push(page3)
-                        text: "Press"
-                    }
-                }
-            }
-            Tab {
-                title: "Tab 2"
-                page: Page {
                     Column {
                         anchors {
                             centerIn: parent
@@ -76,6 +66,16 @@
                     }
                 }
             }
+            Tab {
+                title: "Tab 2"
+                page: Page {
+                    Button {
+                        anchors.centerIn: parent
+                        onClicked: pageStack.push(page3)
+                        text: "Press"
+                    }
+                }
+            }
         }
         Page {
             id: page3

=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
--- tests/unit/tst_components/tst_pagestack.qml	2014-04-25 05:28:37 +0000
+++ tests/unit/tst_components/tst_pagestack.qml	2014-05-09 11:25:49 +0000
@@ -96,6 +96,17 @@
         pageStack.clear();
     }
 
+    function test_pop_to_tabs_bug1316736() {
+        pageStack.push(tabs);
+        tabs.selectedTabIndex = 1;
+        pageStack.push(page1);
+        compare(tabs.active, false, "Tabs on a PageStack, but not on top, are inactive");
+        pageStack.pop();
+        compare(tabs.active, true, "Tabs on top of PageStack is active");
+        compare(tabs.selectedTabIndex, 1, "Pushing and popping another page on top of Tabs does not change selectedTabsIndex");
+        pageStack.clear();
+    }
+
     MainView {
         id: mainView
         PageStack {
@@ -119,5 +130,11 @@
 
     Tabs {
         id: tabs
+        Tab {
+            id: tab1
+        }
+        Tab {
+            id: tab2
+        }
     }
 }