From c644d41709288cdc7464474036ba96d14c34588f Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 8 Nov 2011 14:29:05 +0100 Subject: [PATCH] use hint-focus-over-base to decide where to paint the focus panel --- .../plasmacomponents/qml/TextArea.qml | 1 - .../plasmacomponents/qml/TextField.qml | 1 - .../plasmacomponents/qml/TextFieldFocus.qml | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/declarativeimports/plasmacomponents/qml/TextArea.qml b/declarativeimports/plasmacomponents/qml/TextArea.qml index 434e8bd8c..65cde919b 100644 --- a/declarativeimports/plasmacomponents/qml/TextArea.qml +++ b/declarativeimports/plasmacomponents/qml/TextArea.qml @@ -91,7 +91,6 @@ Item { TextFieldFocus { id: hover - z: 800 state: textArea.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden") anchors.fill: base } diff --git a/declarativeimports/plasmacomponents/qml/TextField.qml b/declarativeimports/plasmacomponents/qml/TextField.qml index dced83630..4611f7273 100644 --- a/declarativeimports/plasmacomponents/qml/TextField.qml +++ b/declarativeimports/plasmacomponents/qml/TextField.qml @@ -92,7 +92,6 @@ Item { TextFieldFocus { id: hover - z: 800 state: textInput.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden") anchors.fill: base } diff --git a/declarativeimports/plasmacomponents/qml/TextFieldFocus.qml b/declarativeimports/plasmacomponents/qml/TextFieldFocus.qml index 0ca21229b..3bc24ffcc 100644 --- a/declarativeimports/plasmacomponents/qml/TextFieldFocus.qml +++ b/declarativeimports/plasmacomponents/qml/TextFieldFocus.qml @@ -25,6 +25,25 @@ Item { id: main state: parent.state + PlasmaCore.Svg { + id: lineEditSvg + imagePath: "widgets/lineedit" + onRepaintNeeded: { + if (lineEditSvg.hasElement("hint-focus-over-base")) { + main.z = 800 + } else { + main.z = 0 + } + } + Component.onCompleted: { + if (lineEditSvg.hasElement("hint-focus-over-base")) { + main.z = 800 + } else { + main.z = 0 + } + } + } + PlasmaCore.FrameSvgItem { id: hover