Properly set position of resize handler after letting it go

fixes #817
fixes sidebar not staying small after restart

2 files changed, 7 insertions, 4 deletions

diff --git a/resources/qml/ChatPage.qml b/resources/qml/ChatPage.qml

index 0b0c8533..38d79a0a 100644
--- a/resources/qml/ChatPage.qml
+++ b/resources/qml/ChatPage.qml
@@ -85,7 +85,9 @@ Rectangle {
             id: roomListC
 
             minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2
-            preferredWidth: Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : roomlist.avatarSize * 5 + Nheko.paddingSmall * 2
+            preferredWidth: (Settings.roomListWidth == - 1)
+                ? (roomlist.avatarSize * 5 + Nheko.paddingSmall * 2)
+                : (Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : collapsedWidth)
             maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2
             collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium
 
diff --git a/resources/qml/components/AdaptiveLayout.qml b/resources/qml/components/AdaptiveLayout.qml

index 756d3291..ae6dec08 100644
--- a/resources/qml/components/AdaptiveLayout.qml
+++ b/resources/qml/components/AdaptiveLayout.qml
@@ -82,7 +82,6 @@ Container {
                 return (collapsible && x < minimumWidth) ? collapsedWidth : x;
         }
 
-        //visible: !container.singlePageMode
         enabled: !container.singlePageMode
         height: container.height
         width: 1
@@ -107,8 +106,10 @@ Container {
             margin: container.splitterGrabMargin
             grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType
             onActiveChanged: {
-                if (!active)
-                    splitter.parent.preferredWidth = splitter.x;
+                if (!active) {
+                    splitter.x = splitter.calculatedWidth;
+                    splitter.parent.preferredWidth = splitter.calculatedWidth;
+                }
 
             }
         }