Merge remote-tracking branch 'origin/master' into newStickerSets

2021-02-14 11:57:36 +01:00 · 2021-02-14 11:57:36 +01:00 · 257fc749ee
commit 257fc749ee
parent ade5cb34fb 352789f79d
1 changed files with 6 additions and 0 deletions
--- a/qml/components/MessageListViewItem.qml
+++ b/qml/components/MessageListViewItem.qml
@ -72,6 +72,12 @@ ListItem {
            contextMenuLoader.active = true;
        }
    }
+
+    onMenuOpenChanged: {
+        // When opening/closing the context menu, we no longer scroll automatically
+        chatView.manuallyScrolledToBottom = false;
+    }
+
    Loader {
        id: contextMenuLoader
        active: false