From 797d63b988ee7bf92648b7aef0a6d3c9b407234d Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Tue, 16 Jul 2019 09:21:45 -0400
Subject: [PATCH] Big code cleanup for SidePane.qml

---
 src/qml/SidePane/SidePane.qml | 58 ++++++++++++++++-------------------
 src/qml/Theme.qml             |  3 +-
 src/qml/UI.qml                |  2 +-
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/src/qml/SidePane/SidePane.qml b/src/qml/SidePane/SidePane.qml
index 9e1be6a0..f1eade5f 100644
--- a/src/qml/SidePane/SidePane.qml
+++ b/src/qml/SidePane/SidePane.qml
@@ -11,46 +11,40 @@ HRectangle {
     visible: mainUI.accountsPresent
 
 
-    // Properties that may be set externally
-
-    property int parentWidth: parent.width
-    onParentWidthChanged: if (canAutoSize) { width = getWidth() }
-
     property bool canAutoSize: true
+    property int parentWidth: parent.width
+
+    // Needed for SplitView because it breaks the binding on collapse
+    onParentWidthChanged: if (canAutoSize) {
+        width = Qt.binding(() => implicitWidth)
+    }
 
 
-    // Pane state properties - should not be modified
+    property int autoWidth:
+        Math.min(
+            parentWidth * theme.sidePane.autoWidthRatio,
+            theme.sidePane.maximumAutoWidth
+        )
 
-    readonly property bool reduced: width < 1
-    readonly property bool collapsed:
-        width < theme.sidePane.collapsedWidth + theme.spacing
+    property bool collapse:
+        canAutoSize ?
+        autoWidth < theme.sidePane.autoCollapseBelowWidth :
+        width < theme.sidePane.autoCollapseBelowWidth
+
+    property bool reduce:
+        window.width < theme.sidePane.autoReduceBelowWindowWidth
+
+    property int implicitWidth:
+        reduce   ? 0 :
+        collapse ? theme.sidePane.collapsedWidth :
+        autoWidth
+
+    property int currentSpacing: collapse ? 0 : theme.spacing
 
-    property int currentSpacing: collapsed ? 0 : theme.spacing
     Behavior on currentSpacing { HNumberAnimation {} }
+    Behavior on implicitWidth  { HNumberAnimation {} }
 
 
-    // Width functions and animations
-
-    function getWidth() {
-        var ts = theme.sidePane
-        return parentWidth * ts.autoWidthRatio < ts.autoCollapseBelowWidth ?
-               ts.collapsedWidth :
-               Math.min(parentWidth * ts.autoWidthRatio, ts.maximumAutoWidth)
-    }
-
-    Behavior on width {
-        HNumberAnimation {
-            // Don't slow down the user manually resizing
-            duration: (
-                canAutoSize &&
-                parentWidth * 0.3 < theme.sidePane.autoReduceBelowWidth * 1.2
-            ) ? theme.animationDuration : 0
-        }
-    }
-
-
-    // Pane content
-
     HColumnLayout {
         anchors.fill: parent
 
diff --git a/src/qml/Theme.qml b/src/qml/Theme.qml
index 6552299b..148972e7 100644
--- a/src/qml/Theme.qml
+++ b/src/qml/Theme.qml
@@ -71,7 +71,8 @@ QtObject {
 
         property int autoCollapseBelowWidth: 120
         property int collapsedWidth: avatar.size
-        property int autoReduceBelowWidth:
+
+        property int autoReduceBelowWindowWidth:
             minimumSupportedWidth + collapsedWidth
 
         property color background: colors.background2
diff --git a/src/qml/UI.qml b/src/qml/UI.qml
index 4edfe12f..7ba6d785 100644
--- a/src/qml/UI.qml
+++ b/src/qml/UI.qml
@@ -40,7 +40,7 @@ Item {
             id: sidePane
             canAutoSize: uiSplitView.canAutoSize
 
-            width: getWidth()  // Initial width
+            width: implicitWidth  // Initial width
             Layout.minimumWidth: theme.sidePane.collapsedWidth
             Layout.maximumWidth: parent.width
         }