diff --git a/src/kcmkwin/kwinoptions/focus.ui b/src/kcmkwin/kwinoptions/focus.ui index 8bf07ed4f8..aea60a4e3f 100644 --- a/src/kcmkwin/kwinoptions/focus.ui +++ b/src/kcmkwin/kwinoptions/focus.ui @@ -200,7 +200,7 @@ - When this option is enabled, the active Xinerama screen (where new windows appear, for example) is the screen containing the mouse pointer. When disabled, the active Xinerama screen is the screen containing the focused window. By default this option is disabled for Click to focus and enabled for other focus policies. + When this option is enabled, the active Xinerama screen (where new windows appear, for example) is the screen containing the mouse pointer. When disabled, the active Xinerama screen is the screen containing the focused window. Active screen follows &mouse diff --git a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg b/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg index 536fd971e4..c4fe5ea9f0 100644 --- a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg +++ b/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg @@ -137,7 +137,7 @@ - focusPolicy() != KWin::Options::ClickToFocus + true diff --git a/src/kcmkwin/kwinoptions/windows.cpp b/src/kcmkwin/kwinoptions/windows.cpp index 97afbf58cc..844df0d878 100644 --- a/src/kcmkwin/kwinoptions/windows.cpp +++ b/src/kcmkwin/kwinoptions/windows.cpp @@ -137,11 +137,6 @@ void KFocusConfig::focusPolicyChanged() // the delayed focus related widgets are: delayFocus m_ui->delayFocusOnLabel->setEnabled(focusPolicy != CLICK_TO_FOCUS); m_ui->kcfg_DelayFocusInterval->setEnabled(focusPolicy != CLICK_TO_FOCUS); - - // on by default for non click to focus policies - if (m_settings->activeMouseScreen() == m_settings->defaultActiveMouseScreenValue()) { - m_ui->kcfg_ActiveMouseScreen->setChecked(focusPolicy != CLICK_TO_FOCUS && focusPolicy != CLICK_TO_FOCUS_MOUSE_PRECEDENT); - } } void KFocusConfig::showEvent(QShowEvent *ev) diff --git a/src/kwin.kcfg b/src/kwin.kcfg index 7485efc7f4..0eccbe4d0e 100644 --- a/src/kwin.kcfg +++ b/src/kwin.kcfg @@ -103,7 +103,7 @@ false - focusPolicy() != Options::ClickToFocus + true true