From 76e4826fbc1126fd14cb62ddb519bc6bb193a8bd Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 20 Oct 2018 05:58:31 -0400
Subject: Mobile/filtering: simplify transitions

We don't need to toggle visibility, toggling height is sufficient. This
dramatically simplifies the transitions.  But as a result we need to use the
'enabled' property to reset the filter.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 mobile-widgets/qml/DiveList.qml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'mobile-widgets/qml/DiveList.qml')

diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 2e0ef290e..5678ab103 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -375,36 +375,24 @@ Kirigami.ScrollablePage {
 		id: filterHeader
 		RowLayout {
 			id: filterBar
+			enabled: rootItem.filterToggle
 			z: 5 //make sure it sits on top
 			states: [
 				State {
 					name: "isVisible"
 					when: rootItem.filterToggle
-					PropertyChanges { target: filterBar; visible: true; height: sitefilter.implicitHeight }
+					PropertyChanges { target: filterBar; height: sitefilter.implicitHeight }
 				},
 				State {
 					name: "isHidden"
 					when: !rootItem.filterToggle
-					PropertyChanges { target: filterBar; visible: false; height: 0 }
+					PropertyChanges { target: filterBar; height: 0 }
 				}
 
 			]
 			transitions: [
 				Transition {
-					from: "isHidden"
-					to: "isVisible"
-					SequentialAnimation {
-						NumberAnimation { property: "visible"; duration: 1 }
-						NumberAnimation { property: "height"; duration: 200; easing.type: Easing.InOutQuad }
-					}
-				},
-				Transition {
-					from: "isVisible"
-					to: "isHidden"
-					SequentialAnimation {
-						NumberAnimation { property: "height"; duration: 200; easing.type: Easing.InOutQuad }
-						NumberAnimation { property: "visible"; duration: 1 }
-					}
+					NumberAnimation { property: "height"; duration: 400; easing.type: Easing.InOutQuad }
 				}
 			]
 
@@ -428,7 +416,7 @@ Kirigami.ScrollablePage {
 					showBusy = false
 					numShown.text = diveModel.shown()
 				}
-				onVisibleChanged: {
+				onEnabledChanged: {
 					// reset the filter when it gets toggled
 					text = ""
 					if (visible) {
-- 
cgit v1.2.3-70-g09d2