From e56308b8a8b74ac857a136897807e92165f77fc7 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 26 Oct 2016 11:55:45 +0200 Subject: [PATCH] feat(Collapse): supports `targetHeight` attribute --- tests/ui/modules/Common/Collapse.qml | 14 +++++++------- .../modules/Common/Popup/AbstractDropDownMenu.qml | 2 +- tests/ui/views/MainWindow/MainWindow.qml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/ui/modules/Common/Collapse.qml b/tests/ui/modules/Common/Collapse.qml index cdd602771..6b94aac14 100644 --- a/tests/ui/modules/Common/Collapse.qml +++ b/tests/ui/modules/Common/Collapse.qml @@ -9,7 +9,8 @@ import Common.Styles 1.0 Item { id: collapse - property var target + property alias target: targetChanges.target + property int targetHeight property bool _collapsed: false @@ -50,13 +51,12 @@ Item { } PropertyChanges { - target: collapse.target - - height: 480 - maximumHeight: 99999 - maximumWidth: 99999 - minimumHeight: 480 + id: targetChanges + height: collapse.targetHeight + maximumHeight: 99999 + maximumWidth: 99999 + minimumHeight: collapse.targetHeight } } diff --git a/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml b/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml index 37a950fcb..2dacf8249 100644 --- a/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml +++ b/tests/ui/modules/Common/Popup/AbstractDropDownMenu.qml @@ -134,7 +134,7 @@ Item { } ScriptAction { - script: menuopened() + script: menuOpened() } } }, diff --git a/tests/ui/views/MainWindow/MainWindow.qml b/tests/ui/views/MainWindow/MainWindow.qml index 3fc85378f..755005b3b 100644 --- a/tests/ui/views/MainWindow/MainWindow.qml +++ b/tests/ui/views/MainWindow/MainWindow.qml @@ -42,6 +42,7 @@ ApplicationWindow { Layout.fillHeight: parent.height Layout.preferredWidth: 25 target: window + targetHeight: 480 } // User info.