From aef9b7375a0788bf3c15ea2a5e24b67a347c1f8a Mon Sep 17 00:00:00 2001 From: James Graham Date: Sat, 23 Mar 2024 17:52:29 +0000 Subject: [PATCH] Fix Opening Maximized Media Make sure the Image and Video Components can correctly get the index for opening the Maximize Media component. --- src/timeline/Bubble.qml | 6 ++++++ src/timeline/ImageComponent.qml | 5 +++++ src/timeline/MessageComponentChooser.qml | 7 +++++++ src/timeline/MessageDelegate.qml | 1 + src/timeline/VideoComponent.qml | 5 +++++ 5 files changed, 24 insertions(+) diff --git a/src/timeline/Bubble.qml b/src/timeline/Bubble.qml index 635d5a035..eb7cafbb5 100644 --- a/src/timeline/Bubble.qml +++ b/src/timeline/Bubble.qml @@ -27,6 +27,11 @@ QQC2.Control { */ required property NeoChatRoom room + /** + * @brief The index of the delegate in the model. + */ + required property var index + /** * @brief The message author. * @@ -148,6 +153,7 @@ QQC2.Control { model: root.contentModel delegate: MessageComponentChooser { room: root.room + index: root.index actionsHandler: root.actionsHandler timeline: root.timeline maxContentWidth: root.maxContentWidth diff --git a/src/timeline/ImageComponent.qml b/src/timeline/ImageComponent.qml index dbd5f62c6..20508582a 100644 --- a/src/timeline/ImageComponent.qml +++ b/src/timeline/ImageComponent.qml @@ -21,6 +21,11 @@ Item { */ required property NeoChatRoom room + /** + * @brief The index of the delegate in the model. + */ + required property var index + /** * @brief The matrix ID of the message event. */ diff --git a/src/timeline/MessageComponentChooser.qml b/src/timeline/MessageComponentChooser.qml index fa0dcdbf8..7c7037fdd 100644 --- a/src/timeline/MessageComponentChooser.qml +++ b/src/timeline/MessageComponentChooser.qml @@ -17,6 +17,11 @@ DelegateChooser { */ required property NeoChatRoom room + /** + * @brief The index of the delegate in the model. + */ + required property var index + /** * @brief The ActionsHandler object to use. * @@ -65,6 +70,7 @@ DelegateChooser { roleValue: MessageComponentType.Image delegate: ImageComponent { room: root.room + index: root.index timeline: root.timeline maxContentWidth: root.maxContentWidth } @@ -74,6 +80,7 @@ DelegateChooser { roleValue: MessageComponentType.Video delegate: VideoComponent { room: root.room + index: root.index timeline: root.timeline maxContentWidth: root.maxContentWidth } diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml index ea6a4a7c0..7c9896781 100644 --- a/src/timeline/MessageDelegate.qml +++ b/src/timeline/MessageDelegate.qml @@ -323,6 +323,7 @@ TimelineDelegate { ] room: root.room + index: root.index author: root.author showAuthor: root.showAuthor || root.alwaysShowAuthor diff --git a/src/timeline/VideoComponent.qml b/src/timeline/VideoComponent.qml index d8f5d362c..5a4322e0c 100644 --- a/src/timeline/VideoComponent.qml +++ b/src/timeline/VideoComponent.qml @@ -24,6 +24,11 @@ Video { */ required property NeoChatRoom room + /** + * @brief The index of the delegate in the model. + */ + required property var index + /** * @brief The matrix ID of the message event. */