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

Modernize code to activate window on user activation

Browse Source 
* use KWindowSystem::updateStartupId() for abstract update of X11
  startup id or wayland activation token
* call QWindow::raise() also for wayland to prepare when it will
  support it
* call KWindowSystem::activateWindow() for all platforms, like done
  by other apps on user-triggered activation
This commit is contained in:
Friedrich W. H. Kossebau
2022-01-03 00:45:16 +01:00
committed by Tobias Fella
parent a29ec0a18a
commit 24644887e0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -24,6 +24,7 @@
#include <KDBusService> #include <KDBusService>
#endif #endif
#ifdef HAVE_WINDOWSYSTEM #ifdef HAVE_WINDOWSYSTEM
#include <kwindowsystem_version.h>
#include <KWindowSystem> #include <KWindowSystem>
#endif #endif
#include <KLocalizedContext> #include <KLocalizedContext>
@@ -78,12 +79,15 @@ using namespace Quotient;
#ifdef HAVE_WINDOWSYSTEM #ifdef HAVE_WINDOWSYSTEM
static void raiseWindow(QWindow *window) static void raiseWindow(QWindow *window)
{ {
#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 91, 0)
KWindowSystem::updateStartupId(window);
#else
if (KWindowSystem::isPlatformWayland()) { if (KWindowSystem::isPlatformWayland()) {
KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN")); KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN"));
KWindowSystem::activateWindow(window->winId());
} else {
window->raise();
} }
#endif
KWindowSystem::activateWindow(window->winId());
window->raise();
} }
#endif #endif