summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2019-11-29 14:51:24 -0500
committerGitHub <noreply@github.com>2019-11-29 14:51:24 -0500
commit4047a90302b2b927725f0a210e0825a8c8073f30 (patch)
tree69f901b0b4f51eee918d4d7d1822325090cd9485 /src/ChatPage.cpp
parentUpdate travis to xcode9.2 for macos (diff)
parentShow encryption enabled and use a non zero size for zero size vide (diff)
downloadnheko-4047a90302b2b927725f0a210e0825a8c8073f30.tar.xz
Merge pull request #91 from Nheko-Reborn/qml-timeline
Qml timeline
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 21ded4b3..091a9fa0 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -113,12 +113,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) view_manager_ = new TimelineViewManager(this); contentLayout_->addWidget(top_bar_); - contentLayout_->addWidget(view_manager_); - - connect(this, - &ChatPage::removeTimelineEvent, - view_manager_, - &TimelineViewManager::removeTimelineEvent); + contentLayout_->addWidget(view_manager_->getWidget()); // Splitter splitter->addWidget(sideBar_); @@ -566,7 +561,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) connect(this, &ChatPage::initializeViews, view_manager_, - [this](const mtx::responses::Rooms &rooms) { view_manager_->initialize(rooms); }); + [this](const mtx::responses::Rooms &rooms) { view_manager_->sync(rooms); }); connect(this, &ChatPage::initializeEmptyViews, view_manager_, @@ -582,7 +577,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) nhlog::db()->error("failed to retrieve invites: {}", e.what()); } - view_manager_->initialize(rooms); + view_manager_->sync(rooms); removeLeftRooms(rooms.leave); bool hasNotifications = false;