ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull in the updates from video delegate to image delegate to improve sizing behaviour.

Browse Source
This commit is contained in:
James Graham
2023-02-02 19:28:49 +00:00
parent 532310d739
commit b901c1bdf2
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/qml/Component/Timeline/ImageDelegate.qml
View File

@@ -27,23 +27,24 @@ TimelineContainer {
readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId readonly property string mediaId: isThumbnail ? content.thumbnailMediaId : content.mediaId
readonly property var maxWidth: Kirigami.Units.gridUnit * 30 readonly property var maxWidth: Kirigami.Units.gridUnit * 30
readonly property var maxHeight: Kirigami.Units.gridUnit * 30
innerObject: AnimatedImage { innerObject: AnimatedImage {
id: img id: img
property var imageWidth: { property var imageWidth: {
if (imageDelegate.info.w > 0) { if (imageDelegate.info && imageDelegate.info.w && imageDelegate.info.w > 0) {
return imageDelegate.info.w; return imageDelegate.info.w;
} else if (sourceSize.width > 0) { } else if (sourceSize.width && sourceSize.width > 0) {
return sourceSize.width; return sourceSize.width;
} else { } else {
return imageDelegate.contentMaxWidth; return imageDelegate.contentMaxWidth;
} }
} }
property var imageHeight: { property var imageHeight: {
if (imageDelegate.info.h > 0) { if (imageDelegate.info && imageDelegate.info.h && imageDelegate.info.h > 0) {
return imageDelegate.info.h; return imageDelegate.info.h;
} else if (sourceSize.height > 0) { } else if (sourceSize.height && sourceSize.height > 0) {
return sourceSize.height; return sourceSize.height;
} else { } else {
// Default to a 16:9 placeholder // Default to a 16:9 placeholder
@@ -51,8 +52,29 @@ TimelineContainer {
} }
} }
Layout.maximumWidth: Math.min(imageDelegate.contentMaxWidth, imageDelegate.maxWidth) readonly property var aspectRatio: imageWidth / imageHeight
Layout.maximumHeight: Math.min(imageDelegate.contentMaxWidth / imageWidth * imageHeight, imageDelegate.maxWidth / imageWidth * imageHeight) /**
* Whether the image should be limited by height or width.
* We need to prevent excessively tall as well as excessively wide media.
*
* @note In the case of a tie the media is width limited.
*/
readonly property bool limitWidth: imageWidth >= imageHeight
readonly property size maxSize: {
if (limitWidth) {
let width = Math.min(imageDelegate.contentMaxWidth, imageDelegate.maxWidth);
let height = width / aspectRatio;
return Qt.size(width, height);
} else {
let height = Math.min(imageDelegate.maxHeight, imageDelegate.contentMaxWidth / aspectRatio);
let width = height * aspectRatio;
return Qt.size(width, height);
}
}
Layout.maximumWidth: maxSize.width
Layout.maximumHeight: maxSize.height
Layout.preferredWidth: imageWidth Layout.preferredWidth: imageWidth
Layout.preferredHeight: imageHeight Layout.preferredHeight: imageHeight
source: model.mediaUrl source: model.mediaUrl

2
src/qml/Component/Timeline/VideoDelegate.qml
View File

@@ -49,7 +49,7 @@ TimelineContainer {
} }
} }
property var videoHeight: { property var videoHeight: {
if (videoDelegate.info && videoDelegate.info.w && videoDelegate.info.h > 0) { if (videoDelegate.info && videoDelegate.info.h && videoDelegate.info.h > 0) {
return videoDelegate.info.h; return videoDelegate.info.h;
} else if (metaData.resolution && metaData.resolution.height) { } else if (metaData.resolution && metaData.resolution.height) {
return metaData.resolution.height; return metaData.resolution.height;