Merge lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2 into lp:ubuntu-ui-toolkit

[Tim Peeters]

Close tabbar on toolbar interaction

[lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2]

873. By Tim Peeters on 2013-11-27

improve comment

874. By Tim Peeters on 2013-11-27

remove a blank line

875. By Tim Peeters on 2013-11-27

remove unused helper function

876. By Tim Peeters on 2013-11-27

put blank line back. no reason to change it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:872
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1338/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1171/console

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2]

877. By Tim Peeters on 2013-11-27

unchanged.

[Cris Dywan (kalikiana)]

Please update components.api. For the record, it's odd that you have to pass defaults to mouseClick/Press/Release functions but let's not worry about that it just makes the tests more verbose but they're good otherwise.

review: Approve

[lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2]

878. By Tim Peeters on 2013-11-27

update components.api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:876
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/289/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/289/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1179/console

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

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2]

879. By Tim Peeters on 2013-11-27

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:878
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/290
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1205
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1185
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3741
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1858

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

review: Approve (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/toolbar-closes-tabbar2]

880. By Tim Peeters on 2013-11-27

fix for occasional local failures of make check

[Tim Peeters (tpeeters)]

Tested on maguro. Apps work, and UITK AP tests pass. Ready for happroval.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:879
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/292
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/292/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1214
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1191
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3747
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1866

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:880
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/294
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3751
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/1869

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2013-11-25 21:52:03 +0000
+++ components.api	2013-11-27 19:20:48 +0000
@@ -173,6 +173,7 @@
     property real triggerSize
     readonly property bool animating
     property bool __closeOnContentsClicks
+    property bool pressed
 modules/Ubuntu/Components/ProgressBar.qml
 AnimatedItem
     property bool indeterminate

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-11-27 11:06:15 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-11-27 19:20:48 +0000
@@ -294,6 +294,12 @@
 
         Toolbar {
             id: toolbarItem
+            onPressedChanged: {
+                if (!pressed) return;
+                if (headerItem.tabBar !== null) {
+                    headerItem.tabBar.selectionMode = false;
+                }
+            }
         }
 
         /*!

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-10-28 14:46:05 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-11-27 19:20:48 +0000
@@ -420,6 +420,16 @@
         visible: panel.__closeOnContentsClicks && panel.locked == false && panel.state == "spread"
     }
 
+    /*!
+      The user presses on the opened toolbar, or when the toolbar is closed but
+      not locked, the user presses in the toolbar trigger area.
+      \qmlproperty bool pressed
+     */
+    // This is a simple alias to draggingArea.pressed, but the documentation is accurate
+    // because of the visible definition of draggingArea. Pressed is false when draggingArea
+    // is not visible.
+    property alias pressed: draggingArea.pressed
+
     DraggingArea {
         id: draggingArea
         orientation: internal.orientation === Qt.Horizontal ? Qt.Vertical : Qt.Horizontal

=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	2013-11-27 10:59:03 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2013-11-27 19:20:48 +0000
@@ -40,6 +40,7 @@
 
                     tools: ToolbarItems {
                         ToolbarButton {
+                            id: toolbarButton
                             text: "something"
                         }
                     }
@@ -64,6 +65,7 @@
             var toolbar = mainView.__propagated.toolbar;
             toolbar.open();
             compare(toolbar.opened, true, "Cannot open toolbar using open()");
+            wait(UbuntuAnimation.FastDuration); // wait for the open animation to finish
             return toolbar;
         }
 
@@ -73,6 +75,7 @@
             compare(tabBar, header.contents, "TabBar is not the active header contents");
             header.show();
             tabBar.selectionMode = newSelectionMode;
+            compare(tabBar.selectionMode, newSelectionMode, "Failed to set the tab bar selection mode");
             return tabBar;
         }
 
@@ -82,5 +85,32 @@
             testCase.setTabBarSelectionMode(true);
             compare(toolbar.opened, false, "Activating TabBar did not close toolbar");
         }
+
+        function test_toolbar_press_closes_tabBar_bug1223606 () {
+            var tabBar = testCase.setTabBarSelectionMode(true);
+            var toolbar = testCase.openToolbar();
+            testCase.mouseClick(toolbarButton,
+                                toolbarButton.width/2, toolbarButton.height/2,
+                                Qt.LeftButton);
+            compare(tabBar.selectionMode, false,
+                    "Clicking a toolbar button does not disable tab bar selection mode");
+
+            toolbar.open();
+            testCase.setTabBarSelectionMode(true);
+            testCase.mousePress(toolbar, toolbar.width/2, toolbar.height/2, Qt.LeftButton);
+            compare(tabBar.selectionMode, false, "Pressing the toolbar does not disable tab bar selection mode");
+            testCase.mouseRelease(toolbar, toolbar.width/2, toolbar.height/2, Qt.LeftButton);
+
+            toolbar.close();
+            testCase.setTabBarSelectionMode(true);
+            testCase.mousePress(mainView,
+                                mainView.width/2, mainView.height - toolbar.triggerSize/2,
+                                Qt.LeftButton);
+            compare(tabBar.selectionMode, false,
+                    "Triggering the toolbar hint does not disable tab selection mode");
+            testCase.mouseRelease(mainView,
+                                mainView.width/2, mainView.height - toolbar.triggerSize/2,
+                                Qt.LeftButton);
+        }
     }
 }