aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Gräßlin <[email protected]>2017-03-23 21:40:51 +0100
committerMartin Gräßlin <[email protected]>2017-04-06 16:49:53 +0200
commit489e6954c5fff79620a93faa5db897fb7684679c (patch)
tree8bf87774a918d97e1fe764d92c8e9d8c92998c92
parent2cbada20a10ea464ec038c33a55738a6be7b63bc (diff)
Support the emergency show property on ksld's lock screen window
Summary: The emergency show window should be considered as a lock screen window and be shown while the screen is locked. This is the KWin part to D5157. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D5158
-rw-r--r--shell_client.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/shell_client.cpp b/shell_client.cpp
index c4322f1..3c2daa1 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -985,6 +985,9 @@ bool ShellClient::isInternal() const
bool ShellClient::isLockScreen() const
{
+ if (m_internalWindow) {
+ return m_internalWindow->property("org_kde_ksld_emergency").toBool();
+ }
return surface()->client() == waylandServer()->screenLockerClientConnection();
}