From 15b75de387af9a9cbbc8aaeac29e29d2a2e2b0f6 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Tue, 2 Mar 2021 12:41:59 -0700 Subject: [PATCH] [plasmacomponents3/TextField|TextArea] Fix placeholder text In TextField, it was not disabled, so the mousearea that changes the cursor shape wasn't working properly. Fixed now. In TextArea, it was not disabled, not the right color, and was inappropriately selectable. Fixed now. The UI tests were testing for these conditions but were broken, and are now fixed by these changes. BUG: 433864 FIXED-IN: 5.80 --- src/declarativeimports/plasmacomponents3/TextArea.qml | 2 ++ src/declarativeimports/plasmacomponents3/TextField.qml | 1 + 2 files changed, 3 insertions(+) diff --git a/src/declarativeimports/plasmacomponents3/TextArea.qml b/src/declarativeimports/plasmacomponents3/TextArea.qml index 695c1c09c..ec3515328 100644 --- a/src/declarativeimports/plasmacomponents3/TextArea.qml +++ b/src/declarativeimports/plasmacomponents3/TextArea.qml @@ -83,6 +83,8 @@ T.TextArea { text: control.placeholderText font: control.font color: theme.viewTextColor + opacity: 0.5 + enabled: false horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) diff --git a/src/declarativeimports/plasmacomponents3/TextField.qml b/src/declarativeimports/plasmacomponents3/TextField.qml index 9e31d51e0..969a22c26 100644 --- a/src/declarativeimports/plasmacomponents3/TextField.qml +++ b/src/declarativeimports/plasmacomponents3/TextField.qml @@ -104,6 +104,7 @@ T.TextField { font: control.font color: theme.viewTextColor opacity: 0.5 + enabled: false horizontalAlignment: control.horizontalAlignment verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)