Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix & improve EventImage thumbnail sizes

Browse Source
This commit is contained in:
miruka
2019-12-20 08:32:57 -04:00
parent be6292a521
commit 5e26188dfe
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/Pages/Chat/Timeline/EventContent.qml
View File

@@ -43,7 +43,7 @@ HRowLayout {
) :
0
// 600px max with a 16px font
// ~600px max with a 16px font
readonly property int maxMessageWidth: theme.fontSize.normal * 0.5 * 75
@@ -85,6 +85,8 @@ HRowLayout {
HColumnLayout {
id: contentColumn
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
HSelectableLabel {
@@ -185,9 +187,8 @@ HRowLayout {
transform: Translate { x: xOffset }
Layout.bottomMargin: pureMedia ? 0 : contentLabel.bottomPadding
Layout.leftMargin: pureMedia ? 0 : contentLabel.leftPadding
Layout.rightMargin: pureMedia ? 0 : contentLabel.rightPadding
Layout.leftMargin: pureMedia ? 0 : eventContent.spacing
Layout.rightMargin: pureMedia ? 0 : eventContent.spacing
Layout.preferredWidth: item ? item.width : -1
Layout.preferredHeight: item ? item.height : -1
}

10
src/gui/Pages/Chat/Timeline/EventImage.qml
View File

@@ -25,7 +25,7 @@ HMxcImage {
readonly property bool isEncrypted: ! utils.isEmptyObject(cryptDict)
readonly property real maxHeight:
theme.chat.message.thumbnailMaxHeightRatio
eventList.height * theme.chat.message.thumbnailMaxHeightRatio
readonly property size fitSize: utils.fitSize(
// Minimum display size
@@ -49,10 +49,12 @@ HMxcImage {
// Maximum display size
Math.min(
eventList.height * maxHeight,
eventContent.maxMessageWidth * Math.min(1, theme.uiScale), // XXX
Math.max(maxHeight, theme.chat.message.thumbnailMinSize.width),
pureMedia ? Infinity : eventContent.maxMessageWidth,
eventDelegate.width - eventContent.spacing - avatarWrapper.width -
eventContent.spacing * 2, // padding
),
eventList.height * maxHeight,
Math.max(maxHeight, theme.chat.message.thumbnailMinSize.height),
)

4
src/gui/Utils.qml
View File

@@ -187,11 +187,11 @@ QtObject {
function fitSize(minWidth, minHeight, width, height, maxWidth, maxHeight) {
if (width >= height) {
let new_width = Math.max(Math.min(width, maxWidth), minWidth)
let new_width = Math.min(Math.max(width, minWidth), maxWidth)
return Qt.size(new_width, height / (width / new_width))
}
let new_height = Math.max(Math.min(height, maxHeight), minHeight)
let new_height = Math.min(Math.max(height, minHeight), maxHeight)
return Qt.size(width / (height / new_height), new_height)
}