From cbe8d772f49e32fc3a4a713eb4c9bf3af6ff501d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Mon, 17 Jun 2024 12:10:11 +0200 Subject: [PATCH] [qt6][ImageGallery] IntrinsicDisplay: Harmonize naming of components --- .../ImageGallery/IntrinsicDisplayDelegate.qml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/meshroom/ui/qml/ImageGallery/IntrinsicDisplayDelegate.qml b/meshroom/ui/qml/ImageGallery/IntrinsicDisplayDelegate.qml index 7fec85ae98..a96d908db6 100644 --- a/meshroom/ui/qml/ImageGallery/IntrinsicDisplayDelegate.qml +++ b/meshroom/ui/qml/ImageGallery/IntrinsicDisplayDelegate.qml @@ -49,11 +49,11 @@ RowLayout { if (!attribute) return undefined switch (attribute.type) { - case "ChoiceParam": return choice_component - case "IntParam": return int_component - case "FloatParam": return float_component - case "BoolParam": return bool_component - case "StringParam": return textField_component + case "ChoiceParam": return choiceComponent + case "IntParam": return intComponent + case "FloatParam": return floatComponent + case "BoolParam": return boolComponent + case "StringParam": return textFieldComponent default: return undefined } } @@ -62,7 +62,7 @@ RowLayout { } Component { - id: textField_component + id: textFieldComponent TextInput { text: attribute.value width: intrinsicModel.columnWidths[columnIndex] @@ -81,14 +81,14 @@ RowLayout { _reconstruction.setAttribute(attribute, text) } Component.onDestruction: { - if(activeFocus) + if (activeFocus) _reconstruction.setAttribute(attribute, text) } } } Component { - id: int_component + id: intComponent TextInput { text: model.display.value @@ -121,7 +121,7 @@ RowLayout { } Component { - id: choice_component + id: choiceComponent ComboBox { id: combo model: attribute.desc !== undefined ? attribute.desc.values : undefined @@ -146,7 +146,7 @@ RowLayout { } Component { - id: bool_component + id: boolComponent CheckBox { checked: attribute ? attribute.value : false padding: 12 @@ -156,7 +156,7 @@ RowLayout { } Component { - id: float_component + id: floatComponent TextInput { readonly property real formattedValue: attribute.value.toFixed(2) property string displayValue: String(formattedValue) @@ -179,9 +179,9 @@ RowLayout { autoScroll: activeFocus - //Use this function to ensure the left part is visible - //while keeping the trick for formatting the text - //Timing issues otherwise + // Use this function to ensure the left part is visible + // while keeping the trick for formatting the text + // Timing issues otherwise onActiveFocusChanged: { if (activeFocus) text = String(attribute.value)