From 3609a029ea4001b9134784f95d92c8f99bf8ef05 Mon Sep 17 00:00:00 2001
From: Cyril Rossi <cyril.rossi@enioka.com>
Date: Wed, 22 Jul 2020 09:01:55 +0000
Subject: [PATCH] KCM KWin Options setting ActiveMouseScreen set proper default
 value

Fix regression that was introduced by a mismatch in the default value of
ActiveMouseScreen option between kwin.kcfg and kwinoptions_settings.kcfg

BUG: 424389


(cherry picked from commit c853f8313a213a0f7d0f98f662f7e98849d547ca)
---
 kcmkwin/kwinoptions/CMakeLists.txt             | 2 +-
 kcmkwin/kwinoptions/kwinoptions_settings.kcfg  | 2 +-
 kcmkwin/kwinoptions/kwinoptions_settings.kcfgc | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt
index a5f0ccf420..8159d1d688 100644
--- a/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kcmkwin/kwinoptions/CMakeLists.txt
@@ -21,7 +21,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_settings.kcfgc GENE
 
 qt5_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
 add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
-target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
+target_link_libraries(kcm_kwinoptions kwin Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem)
 install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
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/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc b/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc
index 2deb143785..dc559eccbe 100644
--- a/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc
+++ b/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc
@@ -1,5 +1,6 @@
 File=kwinoptions_settings.kcfg
 ClassName=KWinOptionsSettings
+IncludeFiles=options.h
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true