summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-02-02 14:10:34 -0500
committerNicolas Werner <nicolas.werner@hotmail.de>2021-02-02 14:10:34 -0500
commitf73418f368d4778c4253adc1c83f857467d9178d (patch)
tree476706301fd2364055bf80797cb5e5e1c782cda9 /src/ChatPage.cpp
parentMerge pull request #444 from LorenDB/dragDropTimeline (diff)
parentMerge branch 'master' into 'privacy_screen' (diff)
downloadnheko-f73418f368d4778c4253adc1c83f857467d9178d.tar.xz
Merge branch 'privacy_screen' into 'master'
Chat Privacy screen

See merge request nheko-reborn/nheko!6
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 07ed3941..db80ecd5 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -333,6 +333,8 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) &ChatPage::initializeMentions, user_mentions_popup_, &popups::UserMentions::initializeMentions); + connect( + this, &ChatPage::chatFocusChanged, view_manager_, &TimelineViewManager::chatFocusChanged); connect(this, &ChatPage::syncUI, this, [this](const mtx::responses::Rooms &rooms) { try { room_list_->cleanupInvites(cache::invites());