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

This commit is contained in:
Sebastian Wolf 2021-02-14 11:57:36 +01:00
commit 257fc749ee
No known key found for this signature in database
GPG key ID: CEA9522B5F38A90A

View file

@ -72,6 +72,12 @@ ListItem {
contextMenuLoader.active = true; contextMenuLoader.active = true;
} }
} }
onMenuOpenChanged: {
// When opening/closing the context menu, we no longer scroll automatically
chatView.manuallyScrolledToBottom = false;
}
Loader { Loader {
id: contextMenuLoader id: contextMenuLoader
active: false active: false