summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-10 23:31:51 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-07-10 23:31:51 +0300
commit6f07ab433e252dd3615cc1633aee856d8ebd83ed (patch)
tree6d7338a67ec5175b2e9f67a47d137e6bee97ea2f /src/timeline
parentLimit -Wshadow to non-gcc (#368) (diff)
downloadnheko-6f07ab433e252dd3615cc1633aee856d8ebd83ed.tar.xz
Send image dimensions in m.image event
fixes #215
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/TimelineView.cc2
-rw-r--r--src/timeline/TimelineViewManager.cc6
2 files changed, 6 insertions, 2 deletions
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<mtx::events::msg::Image>(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<ImageItem, mtx::events::MessageType::Image>(url, filename, mime, size); + view->addUserMessage<ImageItem, mtx::events::MessageType::Image>( + url, filename, mime, size, dimensions); } void