Merge lp:~bzoltan/ubuntu-ui-toolkit/reverse_cherrypicking_rev734 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Reverse cherrypicking rev734

Reverse cherrypicking rev734

[Łukasz Zemczak (sil2100)]

Since the other revert got already approved, I'm approving this one - it seems correct.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CHANGES'
--- CHANGES	2013-09-03 10:12:39 +0000
+++ CHANGES	2013-09-03 10:52:42 +0000
@@ -50,9 +50,6 @@
 * ADDED IN MainView: property bool anchorToKeyboard
 * CHANGED IN Tabs: property Component __headerContents TO property TabBar tabBar
 * CHANGED IN Header: property Component contents TO property Item contents
-* CHANGED IN Panel property bool opened TO readonly property bool opened
-* ADDED IN Panel function open()
-* ADDED IN Panel function close()
 
 Compatibility Breaks
 ********************

=== modified file 'components.api'
--- components.api	2013-09-03 10:12:39 +0000
+++ components.api	2013-09-03 10:52:42 +0000
@@ -157,9 +157,7 @@
 Item
     default property list<Object> contents
     property int align
-    readonly property bool opened
-    function open()
-    function close()
+    property bool opened
     property bool locked
     property real hintSize
     property real triggerSize
@@ -351,7 +349,6 @@
 modules/Ubuntu/Components/Toolbar.qml
 Panel
     property Item tools
-    property int hideTimeout
 modules/Ubuntu/Components/ToolbarButton.qml
 ActionItem
 modules/Ubuntu/Components/ToolbarItems.qml

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-09-02 09:21:40 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-09-03 10:52:42 +0000
@@ -175,23 +175,11 @@
       Use edge swipes to open/close the panel.
       The opened property is not updated until the swipe gesture is completed.
      */
-    // opened is true if state is spread, or if state is moving/hint and the previous state was spread.
-    readonly property bool opened: (panel.state === "spread") ||
-                                   (panel.state === "moving" && internal.previousState === "spread")
+    property bool opened: false
     /*! \internal */
-
-    /*!
-      Open the panel
-     */
-    function open() {
-        panel.state = "spread";
-    }
-
-    /*!
-      Close the panel
-     */
-    function close() {
-        panel.state = "";
+    onOpenedChanged: {
+        if (opened) state = "spread";
+        else state = "";
     }
 
     /*!
@@ -344,19 +332,13 @@
             if (bottomBarVisibilityCommunicator.forceHidden) {
                 internal.savedLocked = panel.locked;
                 internal.savedOpened = panel.opened;
-                panel.close();
+                panel.opened = false;
                 panel.locked = true;
             } else { // don't force hidden
                 panel.locked = internal.savedLocked;
-                if (panel.locked) {
-                    if (internal.savedOpened) {
-                        panel.open();
-                    } else {
-                        panel.close();
-                    }
+                if (internal.savedLocked) panel.opened = internal.savedOpened;
                 // if the panel was locked, do not slide it back in
                 // until the user performs an edge swipe.
-                }
             }
         }
     }
@@ -367,7 +349,12 @@
             internal.movingDelta = panel.hintSize + draggingArea.initialPosition - bar.size;
         } else if (state == "moving" && internal.previousState == "spread") {
             internal.movingDelta = draggingArea.initialPosition;
+        } else if (state == "spread") {
+            panel.opened = true;
+        } else if (state == "") {
+            panel.opened = false;
         }
+        internal.previousState = state;
     }
 
     Toolkit.InverseMouseArea {
@@ -376,7 +363,7 @@
             mouse.accepted = false;
             // the mouse click may cause an update
             //  of locked by the clicked Item behind
-            if (!panel.locked) panel.close();
+            if (!panel.locked) panel.opened = false;
         }
         propagateComposedEvents: true
         visible: panel.locked == false && panel.state == "spread"
@@ -453,11 +440,9 @@
         onPositionChanged: {
             if (panel.locked) return;
             if (panel.state == "hint" && mousePosition < initialPosition - dragThreshold) {
-                internal.previousState = "hint";
                 panel.state = "moving";
                 pressedItem = null;
             } else if (panel.state == "spread" && mousePosition > initialPosition + dragThreshold) {
-                internal.previousState = "spread";
                 panel.state = "moving";
                 pressedItem = null;
             }

=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2013-09-02 13:54:47 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2013-09-03 10:52:42 +0000
@@ -39,63 +39,40 @@
      */
     property Item tools: null
 
-    /*!
-      \preliminary
-      The time in milliseconds before the toolbar automatically hides after inactivity
-      when it is not locked.
-     */
-    property int hideTimeout: 5000
-
     /*! \internal */
     onToolsChanged: {
-        internal.updateVisibleTools();
-        if (tools) {
-            if (tools && tools.hasOwnProperty("locked")) locked = tools.locked;
-            // open the toolbar, except when it is locked in closed position
-            if (tools && tools.hasOwnProperty("locked") && tools.hasOwnProperty("opened")
-                    && !tools.opened && tools.locked) {
-                // toolbar is locked in closed state
-                toolbar.close();
-            } else {
-                toolbar.open();
-            }
-
-            if (tools && tools.hasOwnProperty("opened")) {
-                tools.opened = toolbar.opened;
-            }
-        } else { // no tools
-            locked = true;
-            toolbar.close();
+        if (tools && tools.hasOwnProperty("locked")) locked = tools.locked;
+        if (tools && tools.hasOwnProperty("locked") && tools.hasOwnProperty("opened")
+                && tools.opened && tools.locked) {
+            // toolbar is locked in visible state.
+            internal.updateVisibleTools();
+            opened = true;
+        } else if (!opened && !animating) {
+            // toolbar is closed
+            internal.updateVisibleTools();
+        } else {
+            opened = false;
+            // internal.visibleTools will be updated
+            // when the hide animation is finished
+        }
+        if (tools && tools.hasOwnProperty("opened")) {
+            tools.opened = toolbar.opened;
         }
     }
 
     // if tools is not specified, lock the toolbar in closed position
     locked: tools && tools.hasOwnProperty("locked") ? tools.locked : false
 
-    Timer {
-        id: hideTimer
-        interval: toolbar.hideTimeout
-        running: toolbar.opened && !toolbar.locked
-        onTriggered: toolbar.close()
-    }
-
     onOpenedChanged: {
         if (tools && tools.hasOwnProperty("opened")) {
             tools.opened = toolbar.opened;
         }
-        if (!toolbar.locked) hideTimer.restart()
     }
 
     Connections {
         target: tools
         ignoreUnknownSignals: true
-        onOpenedChanged: {
-            if (tools.opened) {
-                toolbar.open();
-            } else {
-                toolbar.close();
-            }
-        }
+        onOpenedChanged: toolbar.opened = tools.opened;
         onLockedChanged: toolbar.locked = tools.locked;
     }
 

=== modified file 'tests/resources/toolbar/panels.qml'
--- tests/resources/toolbar/panels.qml	2013-09-02 09:02:40 +0000
+++ tests/resources/toolbar/panels.qml	2013-09-03 10:52:42 +0000
@@ -93,7 +93,7 @@
             }
             height: toolbar.height
 
-            StyledItem {
+            Item {
                 id: toolbar
                 anchors {
                     left: parent.left
@@ -103,8 +103,6 @@
                 height: units.gu(8)
                 property bool opened: bottomLeftPanel.opened
                 property bool animating: bottomLeftPanel.animating
-                style: Theme.createStyleComponent("ToolbarStyle.qml", toolbar)
-
                 Label {
                     anchors.centerIn: parent
                     text: "This looks like a standard toolbar"

=== modified file 'tests/unit/tst_components/tst_page.qml'
--- tests/unit/tst_components/tst_page.qml	2013-09-02 10:23:51 +0000
+++ tests/unit/tst_components/tst_page.qml	2013-09-03 10:52:42 +0000
@@ -69,7 +69,6 @@
         function test_0_noHeader_bug1162028_bug1161910() {
             compare(mainView.__propagated.header.title, "", "no header title by default")
             compare(mainView.__propagated.header.visible, false, "header is hidden when title is not set")
-            mainView.__propagated.toolbar.close(); // close toolbar before checking height.
             compare(page.height, mainView.height, "page uses full height when there is no header")
         }
 

=== modified file 'tests/unit/tst_components/tst_toolbar.qml'
--- tests/unit/tst_components/tst_toolbar.qml	2013-09-02 10:23:51 +0000
+++ tests/unit/tst_components/tst_toolbar.qml	2013-09-03 10:52:42 +0000
@@ -44,14 +44,15 @@
             compare(page.tools, toolbarItems, "Page tools are set initially");
             compare(page.__propagated, mainView.__propagated, "propagated property is propagated from mainView to page")
             compare(mainView.__propagated.toolbar.tools, page.tools, "Toolbar tools are set to page tools initially");
-            compare(mainView.__propagated.toolbar.tools.opened, true, "Toolbar is opened initially");
+            compare(mainView.__propagated.toolbar.tools.opened, false, "Toolbar is closed initially");
             compare(mainView.__propagated.toolbar.tools.locked, false, "Toolbar is initially not locked");
         }
 
         function test_opened() {
-            mainView.__propagated.toolbar.open();
+            compare(mainView.__propagated.toolbar.tools.opened, false, "Toolbar initially closed");
+            mainView.__propagated.toolbar.opened = true;
             compare(mainView.__propagated.toolbar.opened, true, "Toolbar can be made opened");
-            mainView.__propagated.toolbar.close();
+            mainView.__propagated.toolbar.opened = false;
             compare(mainView.__propagated.toolbar.opened, false, "Toolbar can be made closed");
             page.tools.opened = true;
             compare(mainView.__propagated.toolbar.opened, true, "Toolbar can be made opened by setting page.tools.opened");
@@ -73,7 +74,7 @@
 
         function test_bug1192673() {
             toolbarItems.opened = false;
-            mainView.__propagated.toolbar.open();
+            mainView.__propagated.toolbar.opened = true;
             compare(toolbarItems.opened, true, "opening the toolbar updates toolbarItems.opened");
             toolbarItems.opened = false;
             compare(mainView.__propagated.toolbar.opened, false, "setting toolbarActions.opened to false closes the toolbar");

=== modified file 'tests/unit/tst_components/tst_toolbaritems.qml'
--- tests/unit/tst_components/tst_toolbaritems.qml	2013-09-02 10:23:51 +0000
+++ tests/unit/tst_components/tst_toolbaritems.qml	2013-09-03 10:52:42 +0000
@@ -61,11 +61,11 @@
         }
 
         function test_opened() {
-            compare(toolbarItems.opened, true, "Toolbar items initially opened");
+            compare(toolbarItems.opened, false, "Toolbar items initially closed");
+            toolbarItems.opened = true;
+            compare(toolbarItems.opened, true, "Toolbar items can be made opened");
             toolbarItems.opened = false;
             compare(toolbarItems.opened, false, "Toolbar items can be made closed");
-            toolbarItems.opened = true;
-            compare(toolbarItems.opened, true, "Toolbar items can be made opened");
         }
 
         function test_locked() {

=== modified file 'tests/unit_x11/tst_components/tst_panel.qml'
--- tests/unit_x11/tst_components/tst_panel.qml	2013-09-02 09:13:50 +0000
+++ tests/unit_x11/tst_components/tst_panel.qml	2013-09-03 10:52:42 +0000
@@ -58,9 +58,9 @@
         }
 
         function test_opened() {
-            panel.open();
+            panel.opened = true;
             compare(panel.opened, true, "Can set opened");
-            panel.close();
+            panel.opened = false;
             compare(panel.opened, false, "Can unset opened");
         }