summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-27 22:15:44 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-04-27 22:15:44 +0300
commit3f80725c33c3c491bb6c186a46f20272bb2dfc46 (patch)
tree00fc4206178bacb9c4a40f6a0521842f194d8d69 /src/timeline
parentAdd remove_if for maps (diff)
downloadnheko-3f80725c33c3c491bb6c186a46f20272bb2dfc46.tar.xz
Add support for displaying m.sticker events
fixes #291
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/TimelineItem.cc14
-rw-r--r--src/timeline/TimelineView.cc3
-rw-r--r--src/timeline/widgets/ImageItem.cc7
3 files changed, 23 insertions, 1 deletions
diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc

index cd1dac67..ce82ebd8 100644 --- a/src/timeline/TimelineItem.cc +++ b/src/timeline/TimelineItem.cc
@@ -210,6 +210,20 @@ TimelineItem::TimelineItem(ImageItem *image, addSaveImageAction(image); } +TimelineItem::TimelineItem(StickerItem *image, + const mtx::events::Sticker &event, + bool with_sender, + const QString &room_id, + QWidget *parent) + : QWidget(parent) + , room_id_{room_id} +{ + setupWidgetLayout<mtx::events::Sticker, StickerItem>( + image, event, " sent a sticker", with_sender); + + addSaveImageAction(image); +} + TimelineItem::TimelineItem(FileItem *file, const mtx::events::RoomEvent<mtx::events::msg::File> &event, bool with_sender, diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc
index 679aa173..d7f674d4 100644 --- a/src/timeline/TimelineView.cc +++ b/src/timeline/TimelineView.cc
@@ -281,6 +281,9 @@ TimelineView::parseMessageEvent(const mtx::events::collections::TimelineEvents & } else if (mpark::holds_alternative<mtx::events::RoomEvent<msg::Video>>(event)) { auto video = mpark::get<mtx::events::RoomEvent<msg::Video>>(event); return processMessageEvent<VideoEvent, VideoItem>(video, direction); + } else if (mpark::holds_alternative<mtx::events::Sticker>(event)) { + return processMessageEvent<mtx::events::Sticker, StickerItem>( + mpark::get<mtx::events::Sticker>(event), direction); } return nullptr; diff --git a/src/timeline/widgets/ImageItem.cc b/src/timeline/widgets/ImageItem.cc
index 3aae63c8..03f9741b 100644 --- a/src/timeline/widgets/ImageItem.cc +++ b/src/timeline/widgets/ImageItem.cc
@@ -138,6 +138,11 @@ ImageItem::setImage(const QPixmap &image) void ImageItem::mousePressEvent(QMouseEvent *event) { + if (!isInteractive_) { + event->accept(); + return; + } + if (event->button() != Qt::LeftButton) return; @@ -204,7 +209,7 @@ ImageItem::paintEvent(QPaintEvent *event) painter.drawPath(path); // Bottom text section - if (underMouse()) { + if (isInteractive_ && underMouse()) { const int textBoxHeight = fontHeight / 2 + 6; textRegion_ = QRectF(0, height_ - textBoxHeight, width_, textBoxHeight);