From 30aedd36a1d3359a0200f14cacebc67e7bcf14a5 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 15 Sep 2021 23:18:21 +0200
Subject: [PATCH] Reenable reuseItems for the message view
If this is still broken, we will need to disable it again.
---
resources/qml/MessageView.qml | 6 +++---
resources/qml/delegates/Encrypted.qml | 4 ++--
resources/qml/delegates/MessageDelegate.qml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 2d4fe3a70..d80d274df 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -25,8 +25,8 @@ ScrollView {
model: room
// reuseItems still has a few bugs, see https://bugreports.qt.io/browse/QTBUG-95105 https://bugreports.qt.io/browse/QTBUG-95107
- //onModelChanged: if (room) room.sendReset()
- //reuseItems: true
+ onModelChanged: if (room) room.sendReset()
+ reuseItems: true
boundsBehavior: Flickable.StopAtBounds
pixelAligned: true
spacing: 4
@@ -361,7 +361,7 @@ ScrollView {
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
width: chat.delegateMaxWidth
- height: section ? section.height + timelinerow.height : timelinerow.height
+ height: Math.max(section.active ? section.height + timelinerow.height : timelinerow.height, 10)
Rectangle {
id: scrollHighlight
diff --git a/resources/qml/delegates/Encrypted.qml b/resources/qml/delegates/Encrypted.qml
index cd00a9d4c..6616d3ced 100644
--- a/resources/qml/delegates/Encrypted.qml
+++ b/resources/qml/delegates/Encrypted.qml
@@ -3,11 +3,11 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import ".."
+import QtQuick 2.15
import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.2
import im.nheko 1.0
-ColumnLayout {
+Column {
id: r
required property int encryptionError
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index 4086a1a83..9f889106a 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -34,7 +34,7 @@ Item {
required property int encryptionError
required property int relatedEventCacheBuster
- height: chooser.child.height
+ height: Math.max(chooser.child.height, 20)
DelegateChooser {
id: chooser
--
GitLab