From e76143c172f857ef85ebda92299fd1db40a96741 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Tue, 14 Jul 2020 15:55:19 -0400
Subject: [PATCH] Add HDrawer.calculatedMinimumSize property

---
 src/gui/Base/HDrawer.qml       | 9 ++++++---
 src/gui/Base/MultiviewPane.qml | 2 +-
 src/gui/MainPane/MainPane.qml  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gui/Base/HDrawer.qml b/src/gui/Base/HDrawer.qml
index c36aa16b..11bbb6fc 100644
--- a/src/gui/Base/HDrawer.qml
+++ b/src/gui/Base/HDrawer.qml
@@ -20,7 +20,7 @@ Drawer {
     property int preferredSize:
         window.getState(this, "preferredSize", defaultSize)
 
-    property int minimumSize: requireDefaultSize ? defaultSize : resizeAreaSize
+    property int minimumSize: resizeAreaSize
     property int maximumSize:
         horizontal ? referenceSizeParent.width : referenceSizeParent.height
 
@@ -40,10 +40,13 @@ Drawer {
 
     property int resizeAreaSize: theme.spacing / 2
 
+    property int calculatedMinimumSize:
+        requireDefaultSize ? defaultSize : minimumSize
+
     readonly property int calculatedSize:
         collapse ?
         peekSizeWhileCollapsed :
-        Math.max(minimumSize, Math.min(preferredSize, maximumSize))
+        Math.max(calculatedMinimumSize, Math.min(preferredSize, maximumSize))
 
     //
 
@@ -88,7 +91,7 @@ Drawer {
         NumberAnimation { duration: 100 }
     }
 
-    Behavior on minimumSize { HNumberAnimation { factor: 0.75 } }
+    Behavior on calculatedMinimumSize { HNumberAnimation { factor: 0.75 } }
 
     Item {
         id: resizeArea
diff --git a/src/gui/Base/MultiviewPane.qml b/src/gui/Base/MultiviewPane.qml
index fc6871fb..f3905e87 100644
--- a/src/gui/Base/MultiviewPane.qml
+++ b/src/gui/Base/MultiviewPane.qml
@@ -19,7 +19,7 @@ HDrawer {
 
 
     defaultSize: buttonRepeater.count * buttonWidth
-    minimumSize: requireDefaultSize ? defaultSize : buttonWidth
+    minimumSize: buttonWidth
 
     HColumnLayout {
         anchors.fill: parent
diff --git a/src/gui/MainPane/MainPane.qml b/src/gui/MainPane/MainPane.qml
index 836d5d18..1ac4407b 100644
--- a/src/gui/MainPane/MainPane.qml
+++ b/src/gui/MainPane/MainPane.qml
@@ -24,7 +24,7 @@ HDrawer {
 
     saveName: "mainPane"
     background: Rectangle { color: theme.mainPane.background }
-    minimumSize: requireDefaultSize ? defaultSize : theme.mainPane.minimumSize
+    minimumSize: theme.mainPane.minimumSize
     requireDefaultSize: bottomBar.filterField.activeFocus
 
     Behavior on opacity { HNumberAnimation {} }