[plasma/plasma-desktop] kcms/access: kcms/access: Drop X11 code
Nicolas Fella <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit af71730483d4a65d731b140b85e60a2e31cc662c by Nicolas Fella.
Committed on 06/08/2026 at 09:59.
Pushed by nicolasfella into branch 'master'.
kcms/access: Drop X11 code
M +0 -6 kcms/access/kcmaccess.cpp
M +0 -3 kcms/access/kcmaccess.h
M +0 -3 kcms/access/kcmaccessibilityzoommagnifier.kcfg
M +2 -19 kcms/access/ui/ZoomMagnifier.qml
https://invent.kde.org/plasma/plasma-desktop/-/commit/af71730483d4a65d731b140b85e60a2e31cc662c
diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp
index 6a4adef3f7..13a70d1fd5 100644
--- a/kcms/access/kcmaccess.cpp
+++ b/kcms/access/kcmaccess.cpp
@@ -275,7 +275,6 @@ void KAccessConfig::save()
|| m_data->zoomMagnifierSettings()->findItem(QStringLiteral("Magnifier"))->isSaveNeeded();
const bool zoomSettingsSaveNeeded = m_data->zoomMagnifierSettings()->findItem(QStringLiteral("SharedZoomFactor"))->isSaveNeeded()
|| m_data->zoomMagnifierSettings()->findItem(QStringLiteral("ZoomMouseTracking"))->isSaveNeeded()
- || m_data->zoomMagnifierSettings()->findItem(QStringLiteral("ZoomEnableFocusTracking"))->isSaveNeeded()
|| m_data->zoomMagnifierSettings()->findItem(QStringLiteral("ZoomEnableTextCaretTracking"))->isSaveNeeded()
|| m_data->zoomMagnifierSettings()->findItem(QStringLiteral("ZoomUsePatternUpscaler"))->isSaveNeeded()
|| m_data->zoomMagnifierSettings()->findItem(QStringLiteral("ZoomPixelGridZoom"))->isSaveNeeded()
@@ -398,11 +397,6 @@ bool KAccessConfig::orcaInstalled()
return tryOrcaRun != -2;
}
-bool KAccessConfig::isPlatformX11() const
-{
- return KWindowSystem::isPlatformX11();
-}
-
MouseSettings *KAccessConfig::mouseSettings() const
{
return m_data->mouseSettings();
diff --git a/kcms/access/kcmaccess.h b/kcms/access/kcmaccess.h
index 0716a7621c..f77136ba4d 100644
--- a/kcms/access/kcmaccess.h
+++ b/kcms/access/kcmaccess.h
@@ -45,7 +45,6 @@ class KAccessConfig : public KQuickManagedConfigModule
Q_PROPERTY(bool colorblindnessCorrectionIsDefaults READ colorblindnessCorrectionIsDefaults NOTIFY colorblindnessCorrectionIsDefaultsChanged)
Q_PROPERTY(bool invertIsDefaults READ invertIsDefaults NOTIFY invertIsDefaultsChanged)
Q_PROPERTY(bool zoomMagnifierIsDefaults READ zoomMagnifierIsDefaults NOTIFY zoomMagnifierIsDefaultsChanged)
- Q_PROPERTY(bool isPlatformX11 READ isPlatformX11 CONSTANT)
public:
KAccessConfig(QObject *parent, const KPluginMetaData &);
@@ -61,8 +60,6 @@ public:
QString orcaLaunchFeedback() const;
- bool isPlatformX11() const;
-
MouseSettings *mouseSettings() const;
BellSettings *bellSettings() const;
KeyboardSettings *keyboardSettings() const;
diff --git a/kcms/access/kcmaccessibilityzoommagnifier.kcfg b/kcms/access/kcmaccessibilityzoommagnifier.kcfg
index 7655f4e3c6..db39c0735a 100644
--- a/kcms/access/kcmaccessibilityzoommagnifier.kcfg
+++ b/kcms/access/kcmaccessibilityzoommagnifier.kcfg
@@ -21,9 +21,6 @@
<entry name="ZoomMouseTracking" key="MouseTracking" type="UInt">
<default>0</default>
</entry>
- <entry name="ZoomEnableFocusTracking" key="EnableFocusTracking" type="Bool">
- <default>false</default>
- </entry>
<entry name="ZoomEnableTextCaretTracking" key="EnableTextCaretTracking" type="Bool">
<default>false</default>
</entry>
diff --git a/kcms/access/ui/ZoomMagnifier.qml b/kcms/access/ui/ZoomMagnifier.qml
index bd6fd357cc..47ede3bc9d 100644
--- a/kcms/access/ui/ZoomMagnifier.qml
+++ b/kcms/access/ui/ZoomMagnifier.qml
@@ -158,18 +158,6 @@ Kirigami.FormLayout {
}
}
- QQC2.CheckBox {
- text: i18nc("@option:check", "Enable focus tracking")
- checked: kcm.zoomMagnifierSettings.zoomEnableFocusTracking
- onCheckedChanged: kcm.zoomMagnifierSettings.zoomEnableFocusTracking = checked
- visible: KWindowSystem.isPlatformX11
-
- KCM.SettingStateBinding {
- configObject: kcm.zoomMagnifierSettings
- settingName: "ZoomEnableFocusTracking"
- }
- }
-
QQC2.CheckBox {
text: i18nc("@option:check", "Enable text caret tracking")
checked: kcm.zoomMagnifierSettings.zoomEnableTextCaretTracking
@@ -321,7 +309,7 @@ Kirigami.FormLayout {
Item {
// For some reason, here setting enabled directly on
// KeySequenceItem does not work, so we wrap it
- enabled: !kcm.isPlatformX11 && (kcm.zoomMagnifierSettings.zoom || kcm.zoomMagnifierSettings.magnifier)
+ enabled: kcm.zoomMagnifierSettings.zoom || kcm.zoomMagnifierSettings.magnifier
implicitWidth: zoomPointerAxisGestureModifiersBox.implicitWidth
implicitHeight: zoomPointerAxisGestureModifiersBox.implicitHeight
@@ -349,15 +337,10 @@ Kirigami.FormLayout {
}
}
}
-
- Kirigami.ContextualHelpButton {
- visible: kcm.isPlatformX11
- toolTipText: i18nc("@info:tooltip, indicates feature unavailable on X11", "Zoom scroll gestures are only available on Wayland.")
- }
}
QQC2.Label {
- enabled: !kcm.isPlatformX11 && zoomPointerAxisGestureModifiersBox.keySequence != ""
+ enabled: zoomPointerAxisGestureModifiersBox.keySequence != ""
text: i18nc("@label Hint for scroll gestures", "Scroll while modifier keys are pressed to zoom")
textFormat: Text.PlainText
wrapMode: Text.Wrap