ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Activate window first thing when clicking on notification

Browse Source 
Currently we enter the room first, which introduces a noticeable delay between clicking the notification and the window being activated
This commit is contained in:
Nicolas Fella
2023-01-19 17:49:35 +01:00
committed by Tobias Fella
parent 8e83b923d9
commit d7e656e57f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/notificationsmanager.cpp
View File

@@ -70,6 +70,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
notification->setDefaultAction(i18n("Open NeoChat in this room")); notification->setDefaultAction(i18n("Open NeoChat in this room"));
connect(notification, &KNotification::defaultActivated, this, [=]() { connect(notification, &KNotification::defaultActivated, this, [=]() {
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) { if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) {
#ifdef QUOTIENT_07 #ifdef QUOTIENT_07
Controller::instance().setActiveConnection(Accounts.get(room->localUser()->id())); Controller::instance().setActiveConnection(Accounts.get(room->localUser()->id()));
@@ -78,7 +79,6 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
#endif #endif
} }
RoomManager::instance().enterRoom(room); RoomManager::instance().enterRoom(room);
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
}); });
if (canReply) { if (canReply) {
@@ -108,9 +108,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
notification->setFlags(KNotification::Persistent); notification->setFlags(KNotification::Persistent);
notification->setDefaultAction(i18n("Open this invitation in NeoChat")); notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
connect(notification, &KNotification::defaultActivated, this, [=]() { connect(notification, &KNotification::defaultActivated, this, [=]() {
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
notification->close(); notification->close();
RoomManager::instance().enterRoom(room); RoomManager::instance().enterRoom(room);
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
}); });
notification->setActions({i18n("Accept Invitation"), i18n("Reject Invitation")}); notification->setActions({i18n("Accept Invitation"), i18n("Reject Invitation")});
connect(notification, &KNotification::action1Activated, this, [room, notification]() { connect(notification, &KNotification::action1Activated, this, [room, notification]() {