From 6f07ab433e252dd3615cc1633aee856d8ebd83ed Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 10 Jul 2018 23:31:51 +0300 Subject: Send image dimensions in m.image event fixes #215 --- src/timeline/TimelineView.cc | 2 ++ src/timeline/TimelineViewManager.cc | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/timeline') diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc index b156b732..ca2f6211 100644 --- a/src/timeline/TimelineView.cc +++ b/src/timeline/TimelineView.cc @@ -1097,6 +1097,8 @@ toRoomMessage(const PendingMessage &m) image.info.size = m.media_size; image.body = m.filename.toStdString(); image.url = m.body.toStdString(); + image.info.h = m.dimensions.height(); + image.info.w = m.dimensions.width(); return image; } diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc index dda71d2f..c8e00b66 100644 --- a/src/timeline/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cc @@ -74,7 +74,8 @@ TimelineViewManager::queueImageMessage(const QString &roomid, const QString &filename, const QString &url, const QString &mime, - uint64_t size) + uint64_t size, + const QSize &dimensions) { if (!timelineViewExists(roomid)) { nhlog::ui()->warn("Cannot send m.image message to a non-managed view"); @@ -83,7 +84,8 @@ TimelineViewManager::queueImageMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage(url, filename, mime, size); + view->addUserMessage( + url, filename, mime, size, dimensions); } void -- cgit 1.5.1