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

MessageEventModel media info improvements

Browse Source 
Create a `messageeventmodel` role for media info and reply media info that is a QMap with all the required data.

This replaces the MediaUrlRole, FileMimeTypeRole and the ContentTypeRole. The reply role no longer needs the content role.

This also ensures mxc urls are now generated for replies. All the media parameters will now have default values assigned in the model so the QML no longer needs to do this.
This commit is contained in:
James Graham
2023-05-03 17:50:48 +00:00
parent a6f108d3b8
commit 10794628ed
9 changed files with 164 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,6 @@ TimelineContainer {
readonly property var maxWidth: Kirigami.Units.gridUnit * 30
readonly property var maxHeight: Kirigami.Units.gridUnit * 30
readonly property var info: model.content.info
onOpenContextMenu: openFileContext(model, vid)
onDownloadedChanged: {
@@ -41,8 +39,8 @@ TimelineContainer {
id: vid
property var videoWidth: {
if (videoDelegate.info && videoDelegate.info.w && videoDelegate.info.w > 0) {
return videoDelegate.info.w;
if (model.mediaInfo.width > 0) {
return model.mediaInfo.width;
} else if (metaData.resolution && metaData.resolution.width) {
return metaData.resolution.width;
} else {
@@ -50,8 +48,8 @@ TimelineContainer {
}
}
property var videoHeight: {
if (videoDelegate.info && videoDelegate.info.h && videoDelegate.info.h > 0) {
return videoDelegate.info.h;
if (model.mediaInfo.height > 0) {
return model.mediaInfo.height;
} else if (metaData.resolution && metaData.resolution.height) {
return metaData.resolution.height;
} else {
@@ -154,11 +152,9 @@ TimelineContainer {
Image {
id: mediaThumbnail
anchors.fill: parent
visible: false
source: model.content.thumbnailMediaId ? "image://mxc/" + model.content.thumbnailMediaId : ""
source: model.mediaInfo.thumbnailInfo.source
fillMode: Image.PreserveAspectFit
}