[plasma/plasma-login-manager] src/frontend: frontend: Remove dead X11 code in greeter/wallpaper
Oliver Beard <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit e6e37f8e75a397f8fdda9bba2c8724395fc79d65 by Oliver Beard.
Committed on 23/07/2026 at 17:11.
Pushed by olib into branch 'master'.
frontend: Remove dead X11 code in greeter/wallpaper
M +6 -18 src/frontend/greeter/main.cpp
M +6 -18 src/frontend/wallpaper/wallpaperapp.cpp
https://invent.kde.org/plasma/plasma-login-manager/-/commit/e6e37f8e75a397f8fdda9bba2c8724395fc79d65
diff --git a/src/frontend/greeter/main.cpp b/src/frontend/greeter/main.cpp
index fd606acf..3450a654 100644
--- a/src/frontend/greeter/main.cpp
+++ b/src/frontend/greeter/main.cpp
@@ -15,7 +15,6 @@
#include <KLocalizedQmlContext>
#include <KLocalizedString>
-#include <KWindowSystem>
#include <LayerShellQt/Window>
#include <PlasmaQuick/PlasmaQuick>
#include <kworkspace6/sessionmanagement.h>
@@ -66,27 +65,16 @@ private:
window->setGeometry(screen->geometry());
- if (KWindowSystem::isPlatformWayland()) {
- if (auto layerShellWindow = LayerShellQt::Window::get(window)) {
- layerShellWindow->setScope(QStringLiteral("plasma-login-greeter"));
- layerShellWindow->setLayer(LayerShellQt::Window::LayerTop);
- layerShellWindow->setExclusiveZone(-1);
- layerShellWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityExclusive);
- layerShellWindow->setScreen(screen);
- }
+ if (auto layerShellWindow = LayerShellQt::Window::get(window)) {
+ layerShellWindow->setScope(QStringLiteral("plasma-login-greeter"));
+ layerShellWindow->setLayer(LayerShellQt::Window::LayerTop);
+ layerShellWindow->setExclusiveZone(-1);
+ layerShellWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityExclusive);
+ layerShellWindow->setScreen(screen);
}
window->setResizeMode(QQuickView::SizeRootObjectToView);
- if (KWindowSystem::isPlatformX11()) {
- // X11 specific hint only on X11
- window->setFlags(Qt::BypassWindowManagerHint);
- } else if (!KWindowSystem::isPlatformWayland()) {
- // on other platforms go fullscreen
- // on Wayland we cannot go fullscreen due to QTBUG 54883
- window->setWindowState(Qt::WindowFullScreen);
- }
-
window->setSource(QUrl("qrc:/qt/qml/org/kde/plasma/login/Main.qml"));
window->show();
}
diff --git a/src/frontend/wallpaper/wallpaperapp.cpp b/src/frontend/wallpaper/wallpaperapp.cpp
index cdb2a10e..cf9cf106 100644
--- a/src/frontend/wallpaper/wallpaperapp.cpp
+++ b/src/frontend/wallpaper/wallpaperapp.cpp
@@ -18,7 +18,6 @@
#include <KConfigPropertyMap>
#include <KLocalizedQmlContext>
#include <KPackage/PackageLoader>
-#include <KWindowSystem>
#include <LayerShellQt/Window>
#include <PlasmaQuick/PlasmaQuick>
@@ -66,27 +65,16 @@ void WallpaperApp::createWindowForScreen(QScreen *screen)
window->setGeometry(screen->geometry());
- if (KWindowSystem::isPlatformWayland()) {
- if (auto layerShellWindow = LayerShellQt::Window::get(window)) {
- layerShellWindow->setScope(QStringLiteral("plasma-login-wallpaper"));
- layerShellWindow->setLayer(LayerShellQt::Window::LayerBackground);
- layerShellWindow->setExclusiveZone(-1);
- layerShellWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityNone);
- layerShellWindow->setScreen(screen);
- }
+ if (auto layerShellWindow = LayerShellQt::Window::get(window)) {
+ layerShellWindow->setScope(QStringLiteral("plasma-login-wallpaper"));
+ layerShellWindow->setLayer(LayerShellQt::Window::LayerBackground);
+ layerShellWindow->setExclusiveZone(-1);
+ layerShellWindow->setKeyboardInteractivity(LayerShellQt::Window::KeyboardInteractivityNone);
+ layerShellWindow->setScreen(screen);
}
window->setResizeMode(QQuickView::SizeRootObjectToView);
- if (KWindowSystem::isPlatformX11()) {
- // X11 specific hint only on X11
- window->setFlags(Qt::BypassWindowManagerHint);
- } else if (!KWindowSystem::isPlatformWayland()) {
- // on other platforms go fullscreen
- // on Wayland we cannot go fullscreen due to QTBUG 54883
- window->setWindowState(Qt::WindowFullScreen);
- }
-
setupWallpaperPlugin(window);
window->show();
}