Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-09 01:22:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable

Browse source 
Fix visibility of values in Wearables dialog
This commit is contained in:
kasenvr 2020-06-11 17:15:49 -04:00 committed by GitHub
commit 80fc2d8332
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/controlsUit/SpinBox.qml
View file

@ -109,7 +109,7 @@ SpinBox {
id: spinboxText
z: 2
color: isLightColorScheme
? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
: (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
selectedTextColor: hifi.colors.black
selectionColor: hifi.colors.primaryHighlight
@ -130,7 +130,7 @@ SpinBox {
}
color: isLightColorScheme
? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
: (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
text: suffix
verticalAlignment: Qt.AlignVCenter

4
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -403,7 +403,6 @@ Rectangle {
Vector3 {
id: positionVector
backgroundColor: "lightgray"
enabled: getCurrentWearable() !== null
function set(localPosition) {
@ -463,7 +462,6 @@ Rectangle {
Vector3 {
id: rotationVector
backgroundColor: "lightgray"
enabled: getCurrentWearable() !== null
function set(localRotationAngles) {
@ -550,7 +548,7 @@ Rectangle {
realFrom: 0.1
realTo: 3.0
realValue: 1.0
backgroundColor: "lightgray"
backgroundColor: activeFocus ? "white" : "lightgray"
width: positionVector.spinboxWidth
colorScheme: hifi.colorSchemes.light

6
interface/resources/qml/hifi/avatarapp/Vector3.qml
View file

@ -29,7 +29,7 @@ Row {
id: xspinner
width: parent.spinboxWidth
labelInside: "X:"
backgroundColor: parent.backgroundColor
backgroundColor: activeFocus ? "white" : "lightgray"
colorLabelInside: hifi.colors.redHighlight
colorScheme: hifi.colorSchemes.light
decimals: root.decimals;
@ -43,7 +43,7 @@ Row {
id: yspinner
width: parent.spinboxWidth
labelInside: "Y:"
backgroundColor: parent.backgroundColor
backgroundColor: activeFocus ? "white" : "lightgray"
colorLabelInside: hifi.colors.greenHighlight
colorScheme: hifi.colorSchemes.light
decimals: root.decimals;
@ -57,7 +57,7 @@ Row {
id: zspinner
width: parent.spinboxWidth
labelInside: "Z:"
backgroundColor: parent.backgroundColor
backgroundColor: activeFocus ? "white" : "lightgray"
colorLabelInside: hifi.colors.primaryHighlight
colorScheme: hifi.colorSchemes.light
decimals: root.decimals;