From 3319e0ec2052dcb292868d3be44b08996e7825ee Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 28 Jan 2020 17:08:49 +0100 Subject: [PATCH] Fix resize loop of images in reply popup --- resources/qml/TimelineView.qml | 2 ++ resources/qml/delegates/ImageMessage.qml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 97121d73..dd171cbd 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -14,6 +14,8 @@ Item { property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive property int avatarSize: 40 + id: timelineRoot + Rectangle { anchors.fill: parent color: colors.window diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 3393f043..cb05021d 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -6,10 +6,10 @@ Item { property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width) property double tempHeight: tempWidth * model.data.proportionalHeight - property bool tooHigh: tempHeight > chat.height - 40 + property bool tooHigh: tempHeight > timelineRoot.height / 2 - height: tooHigh ? chat.height - 40 : tempHeight - width: tooHigh ? (chat.height - 40) / model.data.proportionalHeight : tempWidth + height: tooHigh ? timelineRoot.height / 2 : tempHeight + width: tooHigh ? (timelineRoot.height / 2) / model.data.proportionalHeight : tempWidth Image { id: img