From fe236ca4810da19aca2247fe31c33e7d479090fa Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 23 Sep 2016 16:04:03 +0200
Subject: [PATCH] fix(Collapse): fix broken function

---
 tests/resources.qrc                                |  1 +
 tests/ui/components/collapse/Collapse.qml          | 14 +++++++++-----
 .../invertedMouseArea/InvertedMouseArea.qml        |  4 +++-
 tests/ui/style/qmldir                              |  5 ++++-
 tests/ui/views/mainWindow/mainWindow.qml           |  4 ++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/resources.qrc b/tests/resources.qrc
index 801fc49fd..c282b1cc9 100644
--- a/tests/resources.qrc
+++ b/tests/resources.qrc
@@ -35,6 +35,7 @@
     <file>ui/scripts/utils.js</file>
     <file>ui/style/qmldir</file>
     <file>ui/style/collapse/Style.qml</file>
+    <file>ui/style/Constants.qml</file>
     <file>ui/views/newCall.qml</file>
     <file>ui/views/manageAccounts.qml</file>
     <file>ui/views/mainWindow/mainWindow.qml</file>
diff --git a/tests/ui/components/collapse/Collapse.qml b/tests/ui/components/collapse/Collapse.qml
index 0dc023236..6e50828d4 100644
--- a/tests/ui/components/collapse/Collapse.qml
+++ b/tests/ui/components/collapse/Collapse.qml
@@ -8,16 +8,20 @@ import 'qrc:/ui/style'
 // ===================================================================
 
 Item {
-    property bool _isCollapsed: false
+    property bool _collapsed: false
 
     signal collapsed (bool collapsed)
 
     function collapse () {
-        _isCollapsed = !_isCollapsed
-        collapsed(_isCollapsed)
+        _collapsed = !_collapsed
+        collapsed(_collapsed)
         rotate.start()
     }
 
+    function isCollapsed () {
+        return _collapsed
+    }
+
     ActionButton {
         id: button
 
@@ -34,9 +38,9 @@ Item {
 
         direction: RotationAnimation.Clockwise
         duration: CollapseStyle.animationDuration
-        from: _isCollapsed ? 0 : 180
+        from: _collapsed ? 0 : 180
         property: 'rotation'
         target: button
-        to: _isCollapsed ? 180 : 0
+        to: _collapsed ? 180 : 0
     }
 }
diff --git a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
index ef9df855e..86154867c 100644
--- a/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
+++ b/tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
@@ -1,5 +1,7 @@
 import QtQuick 2.0
 
+import 'qrc:/ui/style'
+
 // ===================================================================
 // Helper to handle button click outside a component.
 // ===================================================================
@@ -67,7 +69,7 @@ Item {
         MouseArea {
             anchors.fill: parent
             propagateComposedEvents: true
-            z: 9999999999 // Ugly! But it's necessary in some cases...
+            z: Constants.zMax
 
             onPressed: {
                 // Propagate event.
diff --git a/tests/ui/style/qmldir b/tests/ui/style/qmldir
index 28bab3e51..bc00e95da 100644
--- a/tests/ui/style/qmldir
+++ b/tests/ui/style/qmldir
@@ -1,2 +1,5 @@
 module Style
-singleton CollapseStyle 1.0 collapse/Style.qml
\ No newline at end of file
+
+singleton Constants 1.0 Constants.qml
+
+singleton CollapseStyle 1.0 collapse/Style.qml
diff --git a/tests/ui/views/mainWindow/mainWindow.qml b/tests/ui/views/mainWindow/mainWindow.qml
index 751dac15f..c34e7c526 100644
--- a/tests/ui/views/mainWindow/mainWindow.qml
+++ b/tests/ui/views/mainWindow/mainWindow.qml
@@ -37,7 +37,7 @@ ApplicationWindow {
                 Layout.fillHeight: parent.height
                 id: collapse
 
-                onCollapsed: mainWindowStates.state = collapsed
+                onCollapsed: mainWindowStates.state = isCollapsed()
                     ? 'collapsed'
                     : ''
             }
@@ -70,7 +70,7 @@ ApplicationWindow {
                 onMenuClosed: content.enabled = true
 
                 onMenuOpened: {
-                    if (!collapse.isCollapsed) {
+                    if (!collapse.isCollapsed()) {
                         collapse.collapse()
                     }
                     content.enabled = false