summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-02-10 14:38:41 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-02-10 14:38:41 +0100
commit6a2e8a695237142390c938ea5638132905f48aff (patch)
tree3e292a590b1b94d57063f6b6784ea4a449cebe31 /resources
parentFix UI allowing edits of foreign messages in some cases (diff)
downloadnheko-6a2e8a695237142390c938ea5638132905f48aff.tar.xz
Try to avoid QTBUG-89568
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/MessageView.qml2
-rw-r--r--resources/qml/delegates/NoticeMessage.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml

index 50e051ab..b0498c4e 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml
@@ -194,7 +194,7 @@ ListView { Connections { target: chat onMovementEnded: { - if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height) + if (y + height + 2 * chat.spacing > chat.contentY + timelineRoot.height && y < chat.contentY + timelineRoot.height) chat.model.currentIndex = index; } diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml
index 67a69055..c38cb555 100644 --- a/resources/qml/delegates/NoticeMessage.qml +++ b/resources/qml/delegates/NoticeMessage.qml
@@ -1,6 +1,6 @@ TextMessage { font.italic: true color: colors.buttonText - height: isReply ? Math.min(chat.height / 8, implicitHeight) : undefined + height: isReply ? Math.min(timelineRoot.height / 8, implicitHeight) : undefined clip: isReply }