From f304a49a58ef29ae0918dd9ac1a61785cc7ed5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 9 Jul 2015 20:43:41 +0200 Subject: [PATCH] [wayland] Only activate ShellClient in takeFocus if it wantsInput This ensures that e.g. virtual keyboards don't get activated. --- shell_client.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shell_client.cpp b/shell_client.cpp index 9b3234fcc5..e08fcb6001 100644 --- a/shell_client.cpp +++ b/shell_client.cpp @@ -422,7 +422,9 @@ const QKeySequence &ShellClient::shortcut() const void ShellClient::takeFocus() { - setActive(true); + if (rules()->checkAcceptFocus(wantsInput())) { + setActive(true); + } bool breakShowingDesktop = !keepAbove() && !isOnScreenDisplay(); if (breakShowingDesktop) {