d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix resize loop of images in reply popup

Browse source
This commit is contained in:
Nicolas Werner 2020-01-28 17:08:49 +01:00
parent 0ade72e970
commit 3319e0ec20
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/TimelineView.qml
View file

@ -14,6 +14,8 @@ Item {
property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive
property int avatarSize: 40 property int avatarSize: 40
id: timelineRoot
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: colors.window color: colors.window

6
resources/qml/delegates/ImageMessage.qml
View file

@ -6,10 +6,10 @@ Item {
property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width) property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width)
property double tempHeight: tempWidth * model.data.proportionalHeight 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 height: tooHigh ? timelineRoot.height / 2 : tempHeight
width: tooHigh ? (chat.height - 40) / model.data.proportionalHeight : tempWidth width: tooHigh ? (timelineRoot.height / 2) / model.data.proportionalHeight : tempWidth
Image { Image {
id: img id: img