Make images always fit the timeline

5 years ago · a73ed771fa
parent 9c1912ed93
commit a73ed771fa
1 changed files with 7 additions and 2 deletions
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@ -3,8 +3,13 @@ import QtQuick 2.6
 import im.nheko 1.0

 Item {
-	width: Math.min(parent ? parent.width : undefined, model.width)
-	height: width * model.proportionalHeight
+	property double tempWidth: Math.min(parent ? parent.width : undefined, model.width)
+	property double tempHeight: tempWidth * model.proportionalHeight
+
+	property bool tooHigh: tempHeight > chat.height - 40
+
+	height: tooHigh ? chat.height - 40 : tempHeight
+	width: tooHigh ? (chat.height - 40) / model.proportionalHeight : tempWidth

 	Image {
 		id: img