Merge lp:~zsombi/ubuntu-ui-toolkit/fixComboButton into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Fix regression introduced in ComboButton due to the binding loop bug on AbstractButton implicit sizes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1315
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/149/console

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

I can confirm that fixes the address book app problem.

review: Approve (test)

=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2016-03-01 19:00:50 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2016-05-11 15:40:04 +0000
@@ -301,6 +301,15 @@
 
     // update sensing area to report clicks only on the main button area
     // area excluding dropDown button and combo list
+    Component.onCompleted: {
+        __mouseArea.anchors.rightMargin = Qt.binding(function() {
+            return combo.__styleInstance.dropDownWidth;
+        });
+        __mouseArea.anchors.bottomMargin = Qt.binding(function () {
+            return combo.expanded ? (combo.height - combo.collapsedHeight) : 0;
+        });
+    }
+
     sensingMargins {
         bottom: -(combo.height - combo.collapsedHeight)
         right: -combo.__styleInstance.dropDownWidth
 
=== added file 'tests/unit_x11/tst_components/tst_combobutton13.qml'
--- tests/unit_x11/tst_components/tst_combobutton13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_combobutton13.qml	2016-05-11 15:40:04 +0000
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 1.3
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        ComboButton {
+            id: combo
+        }
+
+        ComboButton {
+            id: rectCombo
+            onClicked: expanded = false
+
+            Rectangle {
+                id: rect
+                width: parent.width
+                height: units.gu(40)
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0.0
+                        color: "red"
+                    }
+                    GradientStop {
+                        position: 0.5
+                        color: "green"
+                    }
+                    GradientStop {
+                        position: 1.0
+                        color: "blue"
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: columnCombo
+            expandedHeight: -1
+            Column {
+                id: column
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: childrenRect.height
+                Repeater {
+                    model: 5
+                    Rectangle {
+                        width: parent.width
+                        height: units.gu(5)
+                        color: Qt.rgba(Math.random(1), Math.random(1), Math.random(1), 1);
+                    }
+                }
+            }
+        }
+
+        ComboButton {
+            id: longCombo
+            expandedHeight: units.gu(40)
+            Rectangle {
+                id: longRect
+                height: units.gu(10)
+                color: "cyan"
+            }
+        }
+
+        ComboButton {
+            id: listCombo
+            ListView {
+                id: list
+                model: 20
+                height: listCombo.comboListHeight
+                delegate: Standard {
+                    text: modelData
+                }
+            }
+        }
+    }
+
+    SignalSpy { id: spy }
+
+    UbuntuTestCase {
+        name: "ComboButton"
+        when: windowShown
+
+        function cleanup() {
+            rectCombo.expanded =
+            columnCombo.expanded =
+            longCombo.expanded =
+            listCombo.expanded = false;
+            spy.clear();
+            spy.signalName = "";
+            spy.target = undefined;
+        }
+
+        function test_0_defaults() {
+            compare(combo.expanded, false, "not expanded by default");
+            compare(combo.collapsedHeight, combo.implicitHeight, "collapsedHeight is implicitHeight");
+            compare(combo.expandedHeight, combo.collapsedHeight + units.gu(19.5), "expanded height default");
+            var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin;
+            compare(combo.comboListHeight, lheight, "comboListHeight default");
+            compare(combo.comboList.length, 0, "comboList is empty");
+            verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs.");
+        }
+
+        function test_comboListWidth() {
+            var comboListHolder = findChild(rectCombo, "combobutton_combolist");
+            compare(rect.width, comboListHolder.width, "rectCombo list content width is not adjusted");
+            comboListHolder = findChild(columnCombo, "combobutton_combolist");
+            compare(column.width, comboListHolder.width, "columnCombo list content width is not adjusted");
+            comboListHolder = findChild(longCombo, "combobutton_combolist");
+            compare(longRect.width, comboListHolder.width, "longCombo list content width is not adjusted");
+            comboListHolder = findChild(listCombo, "combobutton_combolist");
+            compare(list.width, comboListHolder.width, "listCombo list content width is not adjusted");
+        }
+
+        function test_expandRectComboThroughProperty() {
+            rectCombo.expanded = true;
+            waitForRendering(rectCombo);
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+        }
+
+        function test_expandRectComboThroughClick() {
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, true, "combo is not expanded");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+        }
+
+        function test_autoCollapse() {
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, true, "combo is not expanded");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+
+            mouseClick(rectCombo, rectCombo.width / 2, rectCombo.collapsedHeight / 2);
+            waitForRendering(rectCombo);
+            compare(rectCombo.expanded, false, "combo is not collapsed");
+            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0);
+        }
+
+        function test_flickRectCombo() {
+            // skip the test temporarily due to flakyness on powerpc target
+            // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1315244
+            skip("The test is flaky on powerpc target");
+            var dropDown = findChild(rectCombo, "combobutton_dropdown");
+            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
+            var comboList = findChild(rectCombo, "combobutton_combolist");
+            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
+            waitForRendering(rectCombo);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            verify(comboList.height > rectCombo.expandedHeight);
+            // comboList flicker is the combolist parent's parent
+            var comboListFlicker = findChild(rectCombo, "combobutton_contentflicker");
+            compare(comboListFlicker.interactive, true, "combo list holder must be interactive");
+
+            // drag the rectangle, the Flickable should be moving
+            var x = comboListFlicker.width / 2;
+            var y = comboListFlicker.height / 2;
+            var dy = comboListFlicker.height / 6;
+            spy.target = comboListFlicker;
+            spy.signalName = "onMovementEnded";
+            mouseDrag(comboList, x, y, 0, -dy);
+            waitForRendering(comboListFlicker);
+            spy.wait();
+        }
+
+        function test_autoExpandHeight() {
+            var comboListPanel = findChild(columnCombo, "combobutton_combopanel");
+            var comboList = findChild(columnCombo, "combobutton_combolist");
+            columnCombo.expanded = true;
+            waitForRendering(columnCombo);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            var comboListFlicker = findChild(columnCombo, "combobutton_contentflicker");
+            compare(comboListFlicker.interactive, false, "combo list holder must not be interactive");
+            compare(comboListFlicker.height, columnCombo.comboListHeight, "combo list height differs from the holder height");
+        }
+
+        function test_emptyComboExpanded() {
+            var comboListPanel = findChild(combo, "combobutton_combopanel");
+            var comboList = findChild(combo, "combobutton_combolist");
+            combo.expanded = true;
+            waitForRendering(combo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0, 1000);
+        }
+
+        function test_longCombo() {
+            var comboListPanel = findChild(longCombo, "combobutton_combopanel");
+            var comboList = findChild(longCombo, "combobutton_combolist");
+            longCombo.expanded = true;
+            waitForRendering(longCombo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+            verify(comboListPanel.height < longCombo.expandedHeight);
+        }
+
+        function test_listCombo() {
+            var comboListPanel = findChild(listCombo, "combobutton_combopanel");
+            var comboList = findChild(listCombo, "combobutton_combolist");
+            listCombo.expanded = true;
+            waitForRendering(listCombo);
+            waitForRendering(comboListPanel);
+            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
+
+            compare(list.height, comboList.height, "list and comboList height differs");
+        }
+    }
+}