summary refs log tree commit diff
path: root/src/timeline/TimelineViewManager.cc
diff options
context:
space:
mode:
authorchristarazi <christarazi@users.noreply.github.com>2018-01-09 23:52:59 -0800
committermujx <mujx@users.noreply.github.com>2018-01-10 09:52:59 +0200
commitddfce136ed4de5b80ae5961b6a11363624e0b244 (patch)
treeb3d54b98832f1043d36fe652099625e0579c058e /src/timeline/TimelineViewManager.cc
parentMake group's sidebar visible through an option (diff)
downloadnheko-ddfce136ed4de5b80ae5961b6a11363624e0b244.tar.xz
Add support for pasting images into a room (#180)
fixes #132 
Diffstat (limited to 'src/timeline/TimelineViewManager.cc')
-rw-r--r--src/timeline/TimelineViewManager.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc

index de1e1e32..65c9ac83 100644 --- a/src/timeline/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cc
@@ -85,6 +85,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg) void TimelineViewManager::queueImageMessage(const QString &roomid, + const QSharedPointer<QIODevice> data, const QString &filename, const QString &url) { @@ -95,7 +96,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, filename); + view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, data, filename); } void @@ -110,7 +111,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, filename); + view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, nullptr, filename); } void @@ -125,7 +126,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, filename); + view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, nullptr, filename); } void