Compare commits

..

2 Commits

Author SHA1 Message Date
1b6a9b5955 Update version for new release 6.6.4 2026-04-07 08:41:29 +02:00
79db29353c Fix spectacle crash
focusWindow may have no platform window.


(cherry picked from commit aac600107a)

Co-authored-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
2026-03-26 12:29:49 +00:00
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -204,7 +204,7 @@ bool QWaylandLayerSurface::requestActivate()
return true; return true;
} else { } else {
const auto focusWindow = QGuiApplication::focusWindow(); const auto focusWindow = QGuiApplication::focusWindow();
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window(); const auto wlWindow = focusWindow && focusWindow->handle() ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
if (const auto seat = wlWindow->display()->lastInputDevice()) { if (const auto seat = wlWindow->display()->lastInputDevice()) {
const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString()); const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString());
connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) { connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {