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 62898a891e..0000000000 Binary files a/scripts/developer/utilities/lib/hifi-qml/styles-uit/FiraSansSemiBold.qmlc and /dev/null differ diff --git a/scripts/developer/utilities/lib/hifi-qml/styles-uit/HiFiGlyphs.qmlc b/scripts/developer/utilities/lib/hifi-qml/styles-uit/HiFiGlyphs.qmlc deleted file mode 100644 index bb306d1643..0000000000 Binary files a/scripts/developer/utilities/lib/hifi-qml/styles-uit/HiFiGlyphs.qmlc and /dev/null differ 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 686f84ad17..0000000000 Binary files a/scripts/developer/utilities/lib/hifi-qml/styles-uit/HifiConstants.qmlc and /dev/null differ diff --git a/scripts/developer/utilities/lib/hifi-qml/styles-uit/RalewaySemiBold.qmlc b/scripts/developer/utilities/lib/hifi-qml/styles-uit/RalewaySemiBold.qmlc deleted file mode 100644 index 5e1b97b16b..0000000000 Binary files a/scripts/developer/utilities/lib/hifi-qml/styles-uit/RalewaySemiBold.qmlc and /dev/null differ diff --git a/scripts/developer/utilities/lib/hifi-qml/styles-uit/Separator.qmlc b/scripts/developer/utilities/lib/hifi-qml/styles-uit/Separator.qmlc deleted file mode 100644 index 96d395c653..0000000000 Binary files a/scripts/developer/utilities/lib/hifi-qml/styles-uit/Separator.qmlc and /dev/null differ 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 { } } } + } }