From 5857f4e39834f23069687c38a11a00eb7a1fcacf Mon Sep 17 00:00:00 2001 From: miruka Date: Thu, 19 Dec 2019 19:27:39 -0400 Subject: [PATCH] Better defined maximum sizes for the panes --- src/gui/Base/HDrawer.qml | 4 +--- src/gui/Pages/Chat/Chat.qml | 2 ++ src/gui/Pages/Chat/ChatPage.qml | 1 - src/gui/UI.qml | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/Base/HDrawer.qml b/src/gui/Base/HDrawer.qml index e028880d..f1105036 100644 --- a/src/gui/Base/HDrawer.qml +++ b/src/gui/Base/HDrawer.qml @@ -44,9 +44,7 @@ Drawer { property int minimumSize: resizeAreaSize property int maximumSize: - horizontal ? - referenceSizeParent.width - theme.minimumSupportedWidth : - referenceSizeParent.height - theme.minimumSupportedHeight + horizontal ? referenceSizeParent.width : referenceSizeParent.height // diff --git a/src/gui/Pages/Chat/Chat.qml b/src/gui/Pages/Chat/Chat.qml index 4daef705..d3d702fc 100644 --- a/src/gui/Pages/Chat/Chat.qml +++ b/src/gui/Pages/Chat/Chat.qml @@ -53,9 +53,11 @@ Item { HLoader { id: roomPaneLoader active: ready + sourceComponent: RoomPane { id: roomPane referenceSizeParent: chat + maximumSize: chat.width - theme.minimumSupportedWidth } } } diff --git a/src/gui/Pages/Chat/ChatPage.qml b/src/gui/Pages/Chat/ChatPage.qml index f1e699ea..8c525077 100644 --- a/src/gui/Pages/Chat/ChatPage.qml +++ b/src/gui/Pages/Chat/ChatPage.qml @@ -31,7 +31,6 @@ HPage { id: eventList // Avoid a certain binding loop - Layout.minimumWidth: theme.minimumSupportedWidth Layout.fillWidth: true Layout.fillHeight: true } diff --git a/src/gui/UI.qml b/src/gui/UI.qml index 1969b988..7426bd35 100644 --- a/src/gui/UI.qml +++ b/src/gui/UI.qml @@ -70,6 +70,7 @@ Item { MainPane { id: mainPane + maximumSize: parent.width - theme.minimumSupportedWidth } PageLoader {