yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wayland] Place lockscreen greeter above other windows

Browse source 
Summary: BUG: 420802

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: apol, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D29523
This commit is contained in:
Vlad Zahorodnii 2020-05-08 11:26:27 +03:00
parent 5ea54eda5d
commit 6f8b8efb33
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
abstract_client.cpp
View file

@ -275,6 +275,8 @@ Layer AbstractClient::belongsToLayer() const
// Since the desktop is also activated, nothing should be in the ActiveLayer, though
if (isInternal())
return UnmanagedLayer;
if (isLockScreen())
return UnmanagedLayer;
if (isDesktop())
return workspace()->showingDesktop() ? AboveLayer : DesktopLayer;
if (isSplash()) // no damn annoying splashscreens

19
autotests/integration/lockscreen.cpp
View file

@ -62,6 +62,7 @@ private Q_SLOTS:
void initTestCase();
void init();
void cleanup();
void testStackingOrder();
void testPointer();
void testPointerButton();
void testPointerAxis();
@ -223,6 +224,24 @@ void LockScreenTest::cleanup()
Test::destroyWaylandConnection();
}
void LockScreenTest::testStackingOrder()
{
// This test verifies that the lockscreen greeter is placed above other windows.
QSignalSpy clientAddedSpy(waylandServer(), &WaylandServer::shellClientAdded);
QVERIFY(clientAddedSpy.isValid());
LOCK
QVERIFY(clientAddedSpy.wait());
AbstractClient *client = clientAddedSpy.first().first().value<AbstractClient *>();
QVERIFY(client);
QVERIFY(client->isLockScreen());
QCOMPARE(client->layer(), UnmanagedLayer);
UNLOCK
}
void LockScreenTest::testPointer()
{
using namespace KWayland::Client;