From 86f4119a0502ffefd60abd5963f0d52628ba4e78 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 8 Sep 2019 12:44:46 +0200 Subject: Implement basic ImageMessages in qml timeline I suck at sizing so the images in the message are currently hardcoded to 300 pixels in width... --- src/timeline2/TimelineModel.cpp | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'src/timeline2/TimelineModel.cpp') diff --git a/src/timeline2/TimelineModel.cpp b/src/timeline2/TimelineModel.cpp index 310494b4..16f1dfe6 100644 --- a/src/timeline2/TimelineModel.cpp +++ b/src/timeline2/TimelineModel.cpp @@ -58,6 +58,20 @@ eventFormattedBody(const mtx::events::RoomEvent &e) return QString::fromStdString(e.content.body); } +template +QString +eventUrl(const T &) +{ + return ""; +} +template +auto +eventUrl(const mtx::events::RoomEvent &e) + -> std::enable_if_t::value, QString> +{ + return QString::fromStdString(e.content.url); +} + template qml_mtx_events::EventType toRoomEventType(const mtx::events::Event &e) @@ -146,6 +160,41 @@ toRoomEventType(const mtx::events::Event &) } // ::EventType::Type toRoomEventType(const Event &e) { return // ::EventType::LocationMessage; } + +template +uint64_t +eventHeight(const mtx::events::Event &) +{ + return -1; +} +template +auto +eventHeight(const mtx::events::RoomEvent &e) -> decltype(e.content.info.h) +{ + return e.content.info.h; +} +template +uint64_t +eventWidth(const mtx::events::Event &) +{ + return -1; +} +template +auto +eventWidth(const mtx::events::RoomEvent &e) -> decltype(e.content.info.w) +{ + return e.content.info.w; +} + +template +double +eventPropHeight(const mtx::events::RoomEvent &e) +{ + auto w = eventWidth(e); + if (w == 0) + w = 1; + return eventHeight(e) / (double)w; +} } TimelineModel::TimelineModel(QString room_id, QObject *parent) @@ -167,6 +216,10 @@ TimelineModel::roleNames() const {UserId, "userId"}, {UserName, "userName"}, {Timestamp, "timestamp"}, + {Url, "url"}, + {Height, "height"}, + {Width, "width"}, + {ProportionalHeight, "proportionalHeight"}, }; } int @@ -228,6 +281,19 @@ TimelineModel::data(const QModelIndex &index, int role) const return QVariant(utils::replaceEmoji(boost::apply_visitor( [](const auto &e) -> QString { return eventFormattedBody(e); }, events.value(id)))); + case Url: + return QVariant(boost::apply_visitor( + [](const auto &e) -> QString { return eventUrl(e); }, events.value(id))); + case Height: + return QVariant(boost::apply_visitor( + [](const auto &e) -> qulonglong { return eventHeight(e); }, events.value(id))); + case Width: + return QVariant(boost::apply_visitor( + [](const auto &e) -> qulonglong { return eventWidth(e); }, events.value(id))); + case ProportionalHeight: + return QVariant(boost::apply_visitor( + [](const auto &e) -> double { return eventPropHeight(e); }, events.value(id))); + default: return QVariant(); } -- cgit 1.5.1