From cdd36c9ab12ad59d7cb9d8511fb9888adfa2efed Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 14 Sep 2017 12:49:02 +0300 Subject: [PATCH] Fix #3896: Value field is editable when row is not selected --- src/qml/value-editor/ValueTabs.qml | 3 +++ src/qml/value-editor/editors/MultilineEditor.qml | 1 + src/qml/value-editor/editors/SortedSetItemEditor.qml | 1 + 3 files changed, 5 insertions(+) diff --git a/src/qml/value-editor/ValueTabs.qml b/src/qml/value-editor/ValueTabs.qml index b42fccb0..97552c7b 100644 --- a/src/qml/value-editor/ValueTabs.qml +++ b/src/qml/value-editor/ValueTabs.qml @@ -358,6 +358,7 @@ Repeater { column.visible = true column.resizeToContents() } + valueEditor.clear() } } } @@ -612,6 +613,8 @@ Repeater { valueEditor.item.reset() } } + + onLoaded: clear() } RowLayout { diff --git a/src/qml/value-editor/editors/MultilineEditor.qml b/src/qml/value-editor/editors/MultilineEditor.qml index 9baceb36..34c41224 100644 --- a/src/qml/value-editor/editors/MultilineEditor.qml +++ b/src/qml/value-editor/editors/MultilineEditor.qml @@ -144,6 +144,7 @@ ColumnLayout TextArea { id: textArea + enabled: root.enabled Layout.fillWidth: true Layout.fillHeight: true Layout.preferredHeight: 100 diff --git a/src/qml/value-editor/editors/SortedSetItemEditor.qml b/src/qml/value-editor/editors/SortedSetItemEditor.qml index f5c1ff46..a8e7731f 100644 --- a/src/qml/value-editor/editors/SortedSetItemEditor.qml +++ b/src/qml/value-editor/editors/SortedSetItemEditor.qml @@ -74,6 +74,7 @@ AbstractEditor { } function reset() { + root.active = false scoreText.reset() textArea.reset() }