From 7029148c87af91758997356b8efe46a55fb94d9d Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 15 Jan 2021 13:12:48 -0400 Subject: [PATCH] Fix some chat right pane issues - Remove the default Qt dragMargin: when the right pane was hidden/collapsed in the interface, accidentally clicking on this invisible 10 pixel-wide zone to the right edge of the window would interfere with any button under it, e.g. the button to expand the pane - Fix expand pane button failing to bring back pane (due to dragMargin) and turning the chat page header invisible - Disable swiping to exit panes, interferes with buttons and tiles --- src/gui/Base/HDrawer.qml | 4 +++- src/gui/Pages/Chat/RoomHeader.qml | 7 ------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gui/Base/HDrawer.qml b/src/gui/Base/HDrawer.qml index 3432bbc5..df6ea6a8 100644 --- a/src/gui/Base/HDrawer.qml +++ b/src/gui/Base/HDrawer.qml @@ -81,8 +81,10 @@ Drawer { // FIXME: https://bugreports.qt.io/browse/QTBUG-59141 // dragMargin: parent.width / 2 + // interactive: collapse || forceCollapse + dragMargin: 0 + interactive: false - interactive: collapse || forceCollapse position: 1 visible: ! collapse && ! forceCollapse modal: false diff --git a/src/gui/Pages/Chat/RoomHeader.qml b/src/gui/Pages/Chat/RoomHeader.qml index a8febce8..09e7ae1b 100644 --- a/src/gui/Pages/Chat/RoomHeader.qml +++ b/src/gui/Pages/Chat/RoomHeader.qml @@ -22,13 +22,6 @@ Rectangle { HRowLayout { id: row anchors.fill: parent - visible: opacity > 0 - - // The layout overflows somehow when focusing the room pane and - // is visible behind it (with a transparent theme) - opacity: showRightButton && chat.roomPane.visible ? 0 : 1 - - Behavior on opacity { HNumberAnimation {} } HButton { id: goToMainPaneButton