Compare commits

...

4 Commits

Author SHA1 Message Date
b1317ba122 Update version for new release 6.4.6 2025-11-11 13:51:10 +05:30
7a36531245 Update version for new release 6.4.5 2025-09-09 13:14:08 +05:30
a3970f0741 Update version for new release 6.4.4 2025-08-05 11:36:47 +01:00
435754d5ed When activating, also try token from XDG_ACTIVATION_TOKEN
This matches upstream QWaylandXdgSurface behavior.

It also makes various activation magic e.g. KDBusService work.


(cherry picked from commit f599e829ad)

Co-authored-by: Kai Uwe Broulik <kde@privat.broulik.de>
2025-07-31 07:48:11 +00:00
2 changed files with 5 additions and 1 deletions

View File

@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16)
project(layershellqt)
set(PROJECT_VERSION "6.4.3")
set(PROJECT_VERSION "6.4.6")
set(PROJECT_VERSION_MAJOR 6)
set(CMAKE_C_STANDARD 99)

View File

@ -211,6 +211,10 @@ bool QWaylandLayerSurface::requestActivate()
activation->activate(m_activationToken, window()->wlSurface());
m_activationToken = {};
return true;
} else if (const auto token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN"); !token.isEmpty()) {
activation->activate(token, window()->wlSurface());
qunsetenv("XDG_ACTIVATION_TOKEN");
return true;
} else {
const auto focusWindow = QGuiApplication::focusWindow();
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();