summary refs log tree commit diff
path: root/include
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 /include
parentLimit -Wshadow to non-gcc (#368) (diff)
downloadnheko-6f07ab433e252dd3615cc1633aee856d8ebd83ed.tar.xz
Send image dimensions in m.image event
fixes #215
Diffstat (limited to 'include')
-rw-r--r--include/ChatPage.h3
-rw-r--r--include/timeline/TimelineView.h8
-rw-r--r--include/timeline/TimelineViewManager.h3
3 files changed, 10 insertions, 4 deletions
diff --git a/include/ChatPage.h b/include/ChatPage.h

index faabd6db..3b1562b3 100644 --- a/include/ChatPage.h +++ b/include/ChatPage.h
@@ -93,7 +93,8 @@ signals: const QString &filename, const QString &url, const QString &mime, - qint64 dsize); + qint64 dsize, + const QSize &dimensions); void fileUploaded(const QString &roomid, const QString &filename, const QString &url, diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index 5af359c5..c6ddafd6 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -69,6 +69,7 @@ struct PendingMessage uint64_t media_size; QString event_id; TimelineItem *widget; + QSize dimensions; bool is_encrypted = false; }; @@ -125,7 +126,8 @@ public: void addUserMessage(const QString &url, const QString &filename, const QString &mime, - uint64_t size); + uint64_t size, + const QSize &dimensions = QSize()); void updatePendingMessage(const std::string &txn_id, const QString &event_id); void scrollDown(); @@ -321,7 +323,8 @@ void TimelineView::addUserMessage(const QString &url, const QString &filename, const QString &mime, - uint64_t size) + uint64_t size, + const QSize &dimensions) { auto with_sender = (lastSender_ != local_user_) || isDateDifference(lastMsgTimestamp_); auto trimmed = QFileInfo{filename}.fileName(); // Trim file path. @@ -346,6 +349,7 @@ TimelineView::addUserMessage(const QString &url, message.mime = mime; message.media_size = size; message.widget = view_item; + message.dimensions = dimensions; handleNewUserMessage(message); } diff --git a/include/timeline/TimelineViewManager.h b/include/timeline/TimelineViewManager.h
index 590adb2b..f3c099c1 100644 --- a/include/timeline/TimelineViewManager.h +++ b/include/timeline/TimelineViewManager.h
@@ -67,7 +67,8 @@ public slots: const QString &filename, const QString &url, const QString &mime, - uint64_t dsize); + uint64_t dsize, + const QSize &dimensions); void queueFileMessage(const QString &roomid, const QString &filename, const QString &url,