From 46a9e88c847e4ad78837e68f04b3ba55d3e160ff Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Thu, 6 Oct 2016 14:17:57 +0200
Subject: [PATCH] fix(Paned): better transition usage

---
 tests/ui/modules/Linphone/Paned.qml           | 78 ++++++++++++-------
 .../ui/modules/Linphone/Styles/PanedStyle.qml |  2 +
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/tests/ui/modules/Linphone/Paned.qml b/tests/ui/modules/Linphone/Paned.qml
index 6acf7f729..def846294 100644
--- a/tests/ui/modules/Linphone/Paned.qml
+++ b/tests/ui/modules/Linphone/Paned.qml
@@ -11,6 +11,9 @@ import Utils 1.0
 // Each area can have a fixed or dynamic minimum width.
 // See `minimumLeftLimit` and `minimumRightLimit` attributes.
 //
+// Note: Paned supports too `maximumLeftLimit` and
+// `maximumRightLimit`.
+//
 // To create a dynamic minimum width, it's necessary to give
 // a percentage to `minmimumLeftLimit` or `minimumRightLimit` like:
 // `minimumLeftLimit: '66%'`.
@@ -41,6 +44,8 @@ Item {
   property var _minimumLeftLimit
   property var _minimumRightLimit
 
+  // -----------------------------------------------------------------
+
   function _getLimitValue (limit) {
     if (limit == null) {
       return
@@ -104,6 +109,8 @@ Item {
     }
   }
 
+  // -----------------------------------------------------------------
+
   function _applyLimitsOnUserMove (offset) {
     var minimumRightLimit = _getLimitValue(_minimumRightLimit)
     var minimumLeftLimit = _getLimitValue(_minimumLeftLimit)
@@ -112,11 +119,11 @@ Item {
     if (_isClosed) {
       if (closingEdge === Qt.LeftEdge) {
         if (offset > minimumLeftLimit / 2) {
-          _updateClosing()
+          _open()
         }
       } else {
         if (-offset > minimumRightLimit / 2) {
-          _updateClosing()
+          _open()
         }
       }
 
@@ -134,7 +141,11 @@ Item {
       contentA.width = minimumLeftLimit
 
       if (closingEdge === Qt.LeftEdge && -offset > minimumLeftLimit / 2) {
-        _updateClosing()
+        if (_isClosed) {
+          _open()
+        } else {
+          _close()
+        }
       }
     }
     // width(A) > maximum width(A).
@@ -146,7 +157,11 @@ Item {
       contentA.width = container.width - handle.width - minimumRightLimit
 
       if (closingEdge === Qt.RightEdge && offset > minimumRightLimit / 2) {
-        _updateClosing()
+        if (_isClosed) {
+          _open()
+        } else {
+          _close()
+        }
       }
     }
     // width(B) > maximum width(B).
@@ -159,28 +174,31 @@ Item {
     }
   }
 
-  function _updateClosing () {
-    // Save state and close.
-    if (!_isClosed) {
-      _isClosed = true
-      _savedContentAWidth = contentA.width
+  // -----------------------------------------------------------------
 
-      if (closingEdge === Qt.LeftEdge) {
-        closingTransitionA.running = true
-      } else {
-        closingTransitionB.running = true
-      }
-
-      return
-    }
-
-    // Restore old state.
+  function _open () {
     _isClosed = false
-    contentA.width = _savedContentAWidth
-
     _applyLimits()
   }
 
+  function _close () {
+    _isClosed = true
+    _savedContentAWidth = contentA.width
+    closingTransition.running = true
+  }
+
+  function _inverseClosingState () {
+    if (!_isClosed) {
+      // Save state and close.
+      _close()
+    } else {
+      // Restore old state.
+      openingTransition.running = true
+    }
+  }
+
+  // -----------------------------------------------------------------
+
   onWidthChanged: _applyLimits()
 
   Component.onCompleted: {
@@ -211,7 +229,7 @@ Item {
     hoverEnabled: true
     width: PanedStyle.handle.width
 
-    onDoubleClicked: _updateClosing()
+    onDoubleClicked: _inverseClosingState()
     onMouseXChanged: pressed &&
       _applyLimitsOnUserMove(handle.mouseX - _mouseStart)
 
@@ -237,20 +255,22 @@ Item {
   }
 
   PropertyAnimation {
-    id: closingTransitionA
+    id: openingTransition
 
-    target: contentA
+    duration: PanedStyle.transitionDuration
     property: 'width'
-    to: 0
-    duration: 200
+    target: contentA
+    to: _savedContentAWidth
+
+    onRunningChanged: !running && _open()
   }
 
   PropertyAnimation {
-    id: closingTransitionB
+    id: closingTransition
 
-    duration: 200
+    duration: PanedStyle.transitionDuration
     property: 'width'
     target: contentA
-    to: container.width - handle.width
+    to: closingEdge === Qt.LeftEdge ? 0 : container.width - handle.width
   }
 }
diff --git a/tests/ui/modules/Linphone/Styles/PanedStyle.qml b/tests/ui/modules/Linphone/Styles/PanedStyle.qml
index 5b73bf29a..d9a8de52a 100644
--- a/tests/ui/modules/Linphone/Styles/PanedStyle.qml
+++ b/tests/ui/modules/Linphone/Styles/PanedStyle.qml
@@ -4,6 +4,8 @@ import QtQuick 2.7
 import Linphone 1.0
 
 QtObject {
+  property int transitionDuration: 200
+
   property QtObject handle: QtObject {
     property int width: 10