From 62bf1b253e3b09d516af432d8bd3b34c6979141f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 7 May 2022 18:53:16 +0200 Subject: Rework focus handling --- src/timeline/TimelineModel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/timeline/TimelineModel.cpp') diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index b9c2cefa..142ca793 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1072,7 +1072,8 @@ TimelineModel::setCurrentIndex(int index) if (index != oldIndex) emit currentIndexChanged(index); - if (MainWindow::instance()->activeRoom() != roomId() && QGuiApplication::focusWindow()) + if (!QGuiApplication::focusWindow() || !QGuiApplication::focusWindow()->isActive() || + MainWindow::instance()->windowForRoom(roomId()) != QGuiApplication::focusWindow()) return; if (!currentId.startsWith('m')) { @@ -2338,7 +2339,8 @@ TimelineModel::acceptKnock(const QString &id) if (event->content.membership != Membership::Knock) return; - ChatPage::instance()->inviteUser(QString::fromStdString(event->state_key), QLatin1String("")); + ChatPage::instance()->inviteUser( + room_id_, QString::fromStdString(event->state_key), QLatin1String("")); } bool -- cgit 1.5.1