From 18287ed45bfa47d68c70412861b752212511d7d1 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 13 Oct 2017 01:06:40 -0700 Subject: [PATCH] Banging my head against qml... --- .../utilities/lib/configprop/ConfigSlider.qml | 29 ++++++++------- .../hifi-qml/styles-uit/FiraSansSemiBold.qmlc | Bin 4097 -> 0 bytes .../lib/hifi-qml/styles-uit/HiFiGlyphs.qmlc | Bin 4897 -> 0 bytes .../hifi-qml/styles-uit/HifiConstants.qmlc | Bin 51320 -> 0 bytes .../hifi-qml/styles-uit/RalewaySemiBold.qmlc | Bin 4081 -> 0 bytes .../lib/hifi-qml/styles-uit/Separator.qmlc | Bin 6855 -> 0 bytes .../utilities/render/deferredLighting.qml | 35 +++++++++++++++--- 7 files changed, 46 insertions(+), 18 deletions(-) delete mode 100644 scripts/developer/utilities/lib/hifi-qml/styles-uit/FiraSansSemiBold.qmlc delete mode 100644 scripts/developer/utilities/lib/hifi-qml/styles-uit/HiFiGlyphs.qmlc delete mode 100644 scripts/developer/utilities/lib/hifi-qml/styles-uit/HifiConstants.qmlc delete mode 100644 scripts/developer/utilities/lib/hifi-qml/styles-uit/RalewaySemiBold.qmlc delete mode 100644 scripts/developer/utilities/lib/hifi-qml/styles-uit/Separator.qmlc diff --git a/scripts/developer/utilities/lib/configprop/ConfigSlider.qml b/scripts/developer/utilities/lib/configprop/ConfigSlider.qml index 516193b81c..f82b381a2d 100644 --- a/scripts/developer/utilities/lib/configprop/ConfigSlider.qml +++ b/scripts/developer/utilities/lib/configprop/ConfigSlider.qml @@ -9,16 +9,19 @@ // import QtQuick 2.7 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.3 +import QtQuick.Controls 1.4 as Original +import QtQuick.Controls.Styles 1.4 import "../hifi-qml/styles-uit" import "../hifi-qml/controls-uit" as HifiControls Item { + HifiConstants { id: luci } id: root - width: 400 + + anchors.left: parent.left + anchors.right: parent.right height: 24 property bool integral: false property var config @@ -36,19 +39,19 @@ Item { HifiControls.Label { id: labelControl text: root.label + enabled: true anchors.left: root.left - anchors.leftMargin: 8 - anchors.top: root.top - anchors.topMargin: 7 + anchors.right: root.horizontalCenter + anchors.verticalCenter: root.verticalCenter + //anchors.topMargin: 7 } HifiControls.Label { id: labelValue text: sliderControl.value.toFixed(root.integral ? 0 : 2) anchors.right: root.right - anchors.rightMargin: 8 - anchors.top: root.top - anchors.topMargin: 15 + anchors.bottom: root.bottom + anchors.bottomMargin: 0 } Binding { @@ -62,11 +65,11 @@ Item { HifiControls.Slider { id: sliderControl stepSize: root.integral ? 1.0 : 0.0 - width: root.width-130 - height: 20 + //height: 20 + anchors.left: root.horizontalCenter anchors.right: root.right - anchors.rightMargin: 8 + anchors.rightMargin: 0 anchors.top: root.top - anchors.topMargin: 3 + anchors.topMargin: 0 } } diff --git a/scripts/developer/utilities/lib/hifi-qml/styles-uit/FiraSansSemiBold.qmlc b/scripts/developer/utilities/lib/hifi-qml/styles-uit/FiraSansSemiBold.qmlc deleted file mode 100644 index 62898a891eb53784c3db5fba53a950848e4ef57a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4097 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 diff --git a/scripts/developer/utilities/lib/hifi-qml/styles-uit/HifiConstants.qmlc b/scripts/developer/utilities/lib/hifi-qml/styles-uit/HifiConstants.qmlc deleted file mode 100644 index 686f84ad173d629beb11885bdba32232ee46d480..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51320 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 diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml index 1cf88ec5ac..7ab7342605 100644 --- a/scripts/developer/utilities/render/deferredLighting.qml +++ b/scripts/developer/utilities/render/deferredLighting.qml @@ -16,19 +16,43 @@ import "../lib/hifi-qml/controls-uit" as HifiControls import "../lib/configprop" Rectangle { - id: render; HifiConstants { id: hifi;} + id: render; + anchors.margins: hifi.dimensions.contentMargin.x + color: hifi.colors.baseGray; property var mainViewTask: Render.getConfig("RenderMainView") - + + Row { + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: 10 Column { - spacing: 10 - + padding: 10 + spacing: 5 + + // width: parent.width + anchors.left: parent.left + anchors.right: parent.right + // padding: hifi.dimensions.contentMargin.x + + ConfigSlider { + label: qsTr("ToneMapping") + integral: false + config: render.mainViewTask.getConfig("ToneMapping") + property: "exposure" + max: 2 + min: 0 + + anchors.left: parent.left + anchors.right: parent.right + } + Row { spacing: 20 padding: 10 - Column { + Column { spacing: 10 Repeater { model: [ @@ -249,4 +273,5 @@ Rectangle { } } } + } }