Skip to content

Commit 236435f

Browse files
[ui] Attribute: Remove validValue paradigm and add orange borders on some atribute fields
1 parent 8e94371 commit 236435f

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ RowLayout {
4242
spacing: 2
4343

4444
Pane {
45-
background: Rectangle {
46-
id: background
47-
color: object != undefined && object.validValue ? Qt.darker(parent.palette.window, 1.1) : Qt.darker(Colors.red, 1.5)
48-
}
4945
padding: 0
5046
Layout.preferredWidth: labelWidth || implicitWidth
5147
Layout.fillHeight: true
@@ -140,7 +136,6 @@ RowLayout {
140136
enabled: root.editable && !attribute.isDefault
141137
onTriggered: {
142138
_reconstruction.resetAttribute(attribute)
143-
updateAttributeLabel()
144139
}
145140
}
146141
MenuItem {
@@ -256,14 +251,12 @@ RowLayout {
256251
case "IntParam":
257252
case "FloatParam":
258253
_reconstruction.setAttribute(root.attribute, Number(value))
259-
updateAttributeLabel()
260254
break
261255
case "File":
262256
_reconstruction.setAttribute(root.attribute, value)
263257
break
264258
default:
265259
_reconstruction.setAttribute(root.attribute, value.trim())
266-
updateAttributeLabel()
267260
break
268261
}
269262
}
@@ -495,6 +488,14 @@ RowLayout {
495488
onEditingFinished: setTextFieldAttribute(text)
496489
text: attribute.value
497490
selectByMouse: true
491+
492+
background: Rectangle {
493+
visible: errorMessages.length
494+
border.color: "orange"
495+
color: "transparent"
496+
radius: 2
497+
}
498+
498499
onPressed: {
499500
root.forceActiveFocus()
500501
}
@@ -608,6 +609,7 @@ RowLayout {
608609
values: root.attribute.values
609610
enabled: root.editable
610611
customValueColor: Colors.orange
612+
611613
onToggled: (value, checked) => {
612614
var currentValue = root.attribute.value;
613615
if (!checked) {
@@ -644,6 +646,14 @@ RowLayout {
644646
autoScroll: activeFocus
645647
validator: attribute.type === "FloatParam" ? doubleValidator : intValidator
646648
onEditingFinished: setTextFieldAttribute(text)
649+
650+
background: Rectangle {
651+
visible: errorMessages.length
652+
border.color: "orange"
653+
color: "transparent"
654+
radius: 2
655+
}
656+
647657
onAccepted: {
648658
setTextFieldAttribute(text)
649659

@@ -679,7 +689,6 @@ RowLayout {
679689
onPressedChanged: {
680690
if (!pressed) {
681691
_reconstruction.setAttribute(attribute, formattedValue)
682-
updateAttributeLabel()
683692
}
684693
}
685694
}

0 commit comments

Comments
 (0)