From 6b94be8652ec2e25d1aeb3f3d08f28b378b48ff4 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Thu, 3 Dec 2020 12:04:10 +0200
Subject: [PATCH] Revert "Change the defaults for active screen"

This reverts commit bcba2e252f58edbeb0c6b790df1a4148656ec981.

This change broke a dozen of tests, most of which were fixed. However,
it made more clear that we need to re-evaluate if enabling this option
by default is a good idea.
---
 kcmkwin/kwinoptions/kwinoptions_settings.kcfg | 2 +-
 kwin.kcfg                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kcmkwin/kwinoptions/kwinoptions_settings.kcfg b/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
index 770b2805e8..b5402a5ec1 100644
--- a/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
+++ b/kcmkwin/kwinoptions/kwinoptions_settings.kcfg
@@ -137,7 +137,7 @@
     </entry>
 
     <entry key="ActiveMouseScreen" type="Bool">
-        <default>true</default>
+        <default code="true">focusPolicy() != KWin::Options::ClickToFocus</default>
     </entry>
 
     <entry key="FocusStealingPreventionLevel" type="Int">
diff --git a/kwin.kcfg b/kwin.kcfg
index 6339b4609d..2b06efe52d 100644
--- a/kwin.kcfg
+++ b/kwin.kcfg
@@ -103,7 +103,7 @@
             <default>false</default>
         </entry>
         <entry name="ActiveMouseScreen" type="Bool">
-            <default>true</default>
+            <default code="true">focusPolicy() != Options::ClickToFocus</default>
         </entry>
         <entry name="RollOverDesktops" type="Bool">
             <default>true</default>