thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Send image dimensions in m.image event

Browse source 
fixes #215
This commit is contained in:
Konstantinos Sideris 2018-07-10 23:31:51 +03:00
parent cfaecaab17
commit 6f07ab433e
6 changed files with 67 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/ChatPage.h
View file

@ -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,

8
include/timeline/TimelineView.h
View file

@ -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);
}

3
include/timeline/TimelineViewManager.h
View file

@ -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,