SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase the max gain on color to 9999

Browse Source 
higher values are only possible via direct textbox input
This commit is contained in:
Kung-vr
2019-11-11 04:10:13 +09:00
parent e5061aee47
commit 9168a022bb
2 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/video_page/color/ColorGroupBox.qml
+55 -30
View File
@@ -48,9 +48,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorRedText.text = Math.round(val) + "%" colorRedText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorRed(value.toFixed(2), true) VideoTabController.setColorRed(value.toFixed(2), true)
} }
} }
@@ -65,13 +62,20 @@ GroupBox {
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
if (!isNaN(val)) { if (!isNaN(val)) {
if (val < 5) { if (val < 1) {
val = 5 val = 1
} else if (val > 100.0) { } else if (val > 9999.0) {
val = 100.0 val = 9999.0
} }
var v = (val/100).toFixed(2)
var v = (val/100)
VideoTabController.setColorRed(v.toFixed(2), true)
if (v > 1)
{
colorRedSlider.value = 1
} else {
colorRedSlider.value = v colorRedSlider.value = v
}
} }
text = Math.round(VideoTabController.colorRed * 100) + "%" text = Math.round(VideoTabController.colorRed * 100) + "%"
} }
@@ -92,9 +96,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorGreenText.text = Math.round(val) + "%" colorGreenText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorGreen(value.toFixed(2), true) VideoTabController.setColorGreen(value.toFixed(2), true)
} }
} }
@@ -109,13 +110,20 @@ GroupBox {
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
if (!isNaN(val)) { if (!isNaN(val)) {
if (val < 5) { if (val < 1) {
val = 5 val = 1
} else if (val > 100.0) { } else if (val > 9999.0) {
val = 100.0 val = 9999.0
} }
var v = (val/100).toFixed(2)
var v = (val/100)
VideoTabController.setColorGreen(v.toFixed(2), true)
if (v > 1)
{
colorGreenSlider.value = 1
} else {
colorGreenSlider.value = v colorGreenSlider.value = v
}
} }
text = Math.round(VideoTabController.colorGreen * 100) + "%" text = Math.round(VideoTabController.colorGreen * 100) + "%"
} }
@@ -137,9 +145,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorBlueText.text = Math.round(val) + "%" colorBlueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorBlue(value.toFixed(2), true) VideoTabController.setColorBlue(value.toFixed(2), true)
} }
} }
@@ -154,13 +159,20 @@ GroupBox {
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
if (!isNaN(val)) { if (!isNaN(val)) {
if (val < 5) { if (val < 1) {
val = 5 val = 1
} else if (val > 100.0) { } else if (val > 9999.0) {
val = 100.0 val = 9999.0
} }
var v = (val/100).toFixed(2)
var v = (val/100)
VideoTabController.setColorBlue(v.toFixed(2), true)
if (v > 1)
{
colorBlueSlider.value = 1
} else {
colorBlueSlider.value = v colorBlueSlider.value = v
}
} }
text = Math.round(VideoTabController.colorBlue * 100) + "%" text = Math.round(VideoTabController.colorBlue * 100) + "%"
} }
@@ -171,21 +183,34 @@ GroupBox {
} }
Component.onCompleted: { Component.onCompleted: {
colorRedSlider.value = VideoTabController.colorRed // set up var here to prevent double call to c++ from qml
colorGreenSlider.value = VideoTabController.colorGreen var redValue = VideoTabController.colorRed
colorBlueSlider.value = VideoTabController.colorBlue var greenValue = VideoTabController.colorGreen
var blueValue = VideoTabController.colorBlue
colorRedText.text = Math.round(redValue * 100) + "%"
colorGreenText.text = Math.round(greenValue * 100) + "%"
colorBlueText.text = Math.round(blueValue * 100) + "%"
colorRedSlider.value = redValue
colorGreenSlider.value = greenValue
colorBlueSlider.value = blueValue
} }
Connections { Connections {
target: VideoTabController target: VideoTabController
onColorRedChanged:{ onColorRedChanged:{
colorRedSlider.value = VideoTabController.colorRed var redValue = VideoTabController.colorRed
colorRedText.text = Math.round(redValue * 100) + "%"
colorRedSlider.value = redValue
} }
onColorGreenChanged:{ onColorGreenChanged:{
colorGreenSlider.value = VideoTabController.colorGreen var greenValue = VideoTabController.colorGreen
colorGreenText.text = Math.round(greenValue * 100) + "%"
colorGreenSlider.value = greenValue
} }
onColorBlueChanged:{ onColorBlueChanged:{
colorBlueSlider.value = VideoTabController.colorBlue var blueValue = VideoTabController.colorBlue
colorBlueText.text = Math.round(blueValue * 100) + "%"
colorBlueSlider.value = blueValue
} }
} }
} }
src/res/qml/video_page/overlaycolorbright/OverlayMethodGroupBox.qml
+21 -15
View File
@@ -169,9 +169,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorRedText.text = Math.round(val) + "%" colorRedText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorRed(value.toFixed(2), true) VideoTabController.setColorRed(value.toFixed(2), true)
} }
} }
@@ -193,6 +190,7 @@ GroupBox {
} }
var v = (val/100).toFixed(2) var v = (val/100).toFixed(2)
colorRedSlider.value = v colorRedSlider.value = v
VideoTabController.setColorRed(v.toFixed(2), true)
} }
text = Math.round(VideoTabController.colorRed * 100) + "%" text = Math.round(VideoTabController.colorRed * 100) + "%"
} }
@@ -213,9 +211,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorGreenText.text = Math.round(val) + "%" colorGreenText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorGreen(value.toFixed(2), true) VideoTabController.setColorGreen(value.toFixed(2), true)
} }
} }
@@ -237,6 +232,7 @@ GroupBox {
} }
var v = (val/100).toFixed(2) var v = (val/100).toFixed(2)
colorGreenSlider.value = v colorGreenSlider.value = v
VideoTabController.setColorGreen(v.toFixed(2), true)
} }
text = Math.round(VideoTabController.colorGreen * 100) + "%" text = Math.round(VideoTabController.colorGreen * 100) + "%"
} }
@@ -258,9 +254,6 @@ GroupBox {
onPositionChanged: { onPositionChanged: {
var val = (this.value * 100) var val = (this.value * 100)
colorBlueText.text = Math.round(val) + "%" colorBlueText.text = Math.round(val) + "%"
}
onValueChanged: {
VideoTabController.setColorBlue(value.toFixed(2), true) VideoTabController.setColorBlue(value.toFixed(2), true)
} }
} }
@@ -282,6 +275,7 @@ GroupBox {
} }
var v = (val/100).toFixed(2) var v = (val/100).toFixed(2)
colorBlueSlider.value = v colorBlueSlider.value = v
VideoTabController.setColorBlue(v.toFixed(2), true)
} }
text = Math.round(VideoTabController.colorBlue * 100) + "%" text = Math.round(VideoTabController.colorBlue * 100) + "%"
} }
@@ -295,9 +289,15 @@ GroupBox {
brightnessToggle.checked = VideoTabController.brightnessEnabled brightnessToggle.checked = VideoTabController.brightnessEnabled
colorToggle.checked = VideoTabController.colorOverlayEnabled colorToggle.checked = VideoTabController.colorOverlayEnabled
opacitySlider.value = VideoTabController.colorOverlayOpacity opacitySlider.value = VideoTabController.colorOverlayOpacity
colorRedSlider.value = VideoTabController.colorRed var redValue = VideoTabController.colorRed
colorGreenSlider.value = VideoTabController.colorGreen var greenValue = VideoTabController.colorGreen
colorBlueSlider.value = VideoTabController.colorBlue var blueValue = VideoTabController.colorBlue
colorRedText.text = Math.round(redValue * 100) + "%"
colorGreenText.text = Math.round(greenValue * 100) + "%"
colorBlueText.text = Math.round(blueValue * 100) + "%"
colorRedSlider.value = redValue
colorGreenSlider.value = greenValue
colorBlueSlider.value = blueValue
} }
Connections { Connections {
@@ -317,13 +317,19 @@ GroupBox {
} }
onColorRedChanged:{ onColorRedChanged:{
colorRedSlider.value = VideoTabController.colorRed var redValue = VideoTabController.colorRed
colorRedText.text = Math.round(redValue * 100) + "%"
colorRedSlider.value = redValue
} }
onColorGreenChanged:{ onColorGreenChanged:{
colorGreenSlider.value = VideoTabController.colorGreen var greenValue = VideoTabController.colorGreen
colorGreenText.text = Math.round(greenValue * 100) + "%"
colorGreenSlider.value = greenValue
} }
onColorBlueChanged:{ onColorBlueChanged:{
colorBlueSlider.value = VideoTabController.colorBlue var blueValue = VideoTabController.colorBlue
colorBlueText.text = Math.round(blueValue * 100) + "%"
colorBlueSlider.value = blueValue
} }
} }
} }