From 34bae25d0e1024c0ed5311ec390062204b6b99b2 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 5 Jun 2019 00:33:44 -0700 Subject: [PATCH] fixing the broken binding dependency for the propitems --- scripts/developer/utilities/lib/prop/PropBool.qml | 7 +------ scripts/developer/utilities/lib/prop/PropEnum.qml | 7 +------ scripts/developer/utilities/lib/prop/PropItem.qml | 2 +- scripts/developer/utilities/lib/prop/PropScalar.qml | 7 +++++++ scripts/developer/utilities/render/luci/Framebuffer.qml | 2 +- .../utilities/render/luci/PerformanceSettings.qml | 1 + scripts/developer/utilities/render/performanceSetup.qml | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/scripts/developer/utilities/lib/prop/PropBool.qml b/scripts/developer/utilities/lib/prop/PropBool.qml index 1d50ec7dd3..de07a53e47 100644 --- a/scripts/developer/utilities/lib/prop/PropBool.qml +++ b/scripts/developer/utilities/lib/prop/PropBool.qml @@ -14,12 +14,6 @@ PropItem { Global { id: global } id: root - property alias valueVar : checkboxControl.checked - - Component.onCompleted: { - valueVar = root.valueVarGetter(); - } - PropCheckBox { id: checkboxControl @@ -27,6 +21,7 @@ PropItem { anchors.verticalCenter: root.verticalCenter width: root.width * global.valueAreaWidthScale + checked: root.valueVarGetter(); onCheckedChanged: { root.valueVarSetter(checked); } } } \ No newline at end of file diff --git a/scripts/developer/utilities/lib/prop/PropEnum.qml b/scripts/developer/utilities/lib/prop/PropEnum.qml index c7869050ba..2268b21e34 100644 --- a/scripts/developer/utilities/lib/prop/PropEnum.qml +++ b/scripts/developer/utilities/lib/prop/PropEnum.qml @@ -15,13 +15,8 @@ PropItem { Global { id: global } id: root - property alias valueVar : valueCombo.currentIndex property alias enums : valueCombo.model - Component.onCompleted: { - valueVar = root.valueVarGetter(); - } - PropComboBox { id: valueCombo @@ -33,6 +28,6 @@ PropItem { height: global.slimHeight currentIndex: root.valueVarGetter() - onCurrentIndexChanged: { root.valueVarSetter(currentIndex); } + onCurrentIndexChanged: root.valueVarSetter(currentIndex) } } diff --git a/scripts/developer/utilities/lib/prop/PropItem.qml b/scripts/developer/utilities/lib/prop/PropItem.qml index 03eabae39b..f1a3b236d8 100644 --- a/scripts/developer/utilities/lib/prop/PropItem.qml +++ b/scripts/developer/utilities/lib/prop/PropItem.qml @@ -23,7 +23,7 @@ Item { // value is accessed through the "valueVarSetter" and "valueVarGetter" // By default, these just go get or set the value from the object[property] // - function defaultGet() { return root.object[root.property]; } + function defaultGet() { var v = root.object[root.property]; return v; } function defaultSet(value) { root.object[root.property] = value; } // function defaultSetReadOnly(value) { log ( "read only " + property + ", NOT setting to " + value); } // function defaultSetReadOnly(value) {} diff --git a/scripts/developer/utilities/lib/prop/PropScalar.qml b/scripts/developer/utilities/lib/prop/PropScalar.qml index 4c569eb57e..41915bb68b 100644 --- a/scripts/developer/utilities/lib/prop/PropScalar.qml +++ b/scripts/developer/utilities/lib/prop/PropScalar.qml @@ -32,6 +32,13 @@ PropItem { valueVar = root.valueVarGetter(); } + Connections + { + target: obj; + onValueChanged: console.log('changed'); + } + + PropLabel { id: valueLabel enabled: root.showValue diff --git a/scripts/developer/utilities/render/luci/Framebuffer.qml b/scripts/developer/utilities/render/luci/Framebuffer.qml index 89d5e59002..dd2b57d085 100644 --- a/scripts/developer/utilities/render/luci/Framebuffer.qml +++ b/scripts/developer/utilities/render/luci/Framebuffer.qml @@ -29,7 +29,7 @@ Column { label: "Debug Buffer" object: config property: "mode" - valueVar: 0 + // valueVar: 0 enums: [ "Off", "Depth", diff --git a/scripts/developer/utilities/render/luci/PerformanceSettings.qml b/scripts/developer/utilities/render/luci/PerformanceSettings.qml index ba3ecada9d..8794ade40c 100644 --- a/scripts/developer/utilities/render/luci/PerformanceSettings.qml +++ b/scripts/developer/utilities/render/luci/PerformanceSettings.qml @@ -32,6 +32,7 @@ Column { } Prop.PropEnum { + id: refreshrateProfileControl label: "Refresh Rate Profile" object: Performance property: "refreshRateProfile" diff --git a/scripts/developer/utilities/render/performanceSetup.qml b/scripts/developer/utilities/render/performanceSetup.qml index 416c074e0f..ab00d31f2b 100644 --- a/scripts/developer/utilities/render/performanceSetup.qml +++ b/scripts/developer/utilities/render/performanceSetup.qml @@ -50,7 +50,7 @@ Rectangle { } } } - /* Prop.PropFolderPanel { + Prop.PropFolderPanel { label: "Platform" panelFrameData: Component { Platform { @@ -58,7 +58,7 @@ Rectangle { anchors.right: parent.right } } - }*/ + } } } }