Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix oversized text, invalid color handling

Browse source
This commit is contained in:
Brad Davis 2016-01-28 16:36:28 -08:00
parent 72b264dcde
commit 8c19b95ea2
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/overlays/RectangleOverlay.qml
View file

@ -25,9 +25,9 @@ Overlay {
case "y": root.y = value; break; case "y": root.y = value; break;
case "visible": root.visible = value; break; case "visible": root.visible = value; break;
case "alpha": rectangle.color.a = value; break; case "alpha": rectangle.color.a = value; break;
case "color": rectangle.color = Qt.rgba(value.red, value.green, value.blue, rectangle.color.a); break; case "color": rectangle.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, rectangle.color.a); break;
case "borderAlpha": rectangle.border.color.a = value; break; case "borderAlpha": rectangle.border.color.a = value; break;
case "borderColor": rectangle.border.color = Qt.rgba(value.red, value.green, value.blue, rectangle.border.color.a); break; case "borderColor": rectangle.border.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, rectangle.border.color.a); break;
case "borderWidth": rectangle.border.width = value; break; case "borderWidth": rectangle.border.width = value; break;
case "radius": rectangle.radius = value; break; case "radius": rectangle.radius = value; break;
default: console.log("OVERLAY Unhandled rectangle property " + key); default: console.log("OVERLAY Unhandled rectangle property " + key);

23
interface/resources/qml/hifi/overlays/TextOverlay.qml
View file

@ -23,6 +23,7 @@ Overlay {
} }
} }
function updatePropertiesFromScript(properties) { function updatePropertiesFromScript(properties) {
var keys = Object.keys(properties); var keys = Object.keys(properties);
for (var i = 0; i < keys.length; ++i) { for (var i = 0; i < keys.length; ++i) {
@ -38,23 +39,13 @@ Overlay {
case "margin": textField.anchors.margins = value; break; case "margin": textField.anchors.margins = value; break;
case "leftMargin": textField.anchors.leftMargin = value; break; case "leftMargin": textField.anchors.leftMargin = value; break;
case "topMargin": textField.anchors.topMargin = value; break; case "topMargin": textField.anchors.topMargin = value; break;
case "color": case "color": // fall through
case "textColor": textField.color = Qt.rgba(value.red, value.green, value.blue, textField.color.a); break; case "textColor": textField.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, textField.color.a); break;
case "text": textField.text = value; break; case "text": textField.text = value; break;
case "backgroundAlpha": case "backgroundAlpha": background.color = Qt.rgba(background.color.r, background.color.g, background.color.b, value); break;
if ("object" === typeof(value)) { case "backgroundColor": background.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, background.color.a); break;
console.log("OVERLAY Unexpected object for alpha"); case "font": textField.font.pixelSize = value.size; break;
dumpObject(value) case "lineHeight": textField.lineHeight = value; break;
} else {
background.color.a = value; break;
}
break
case "backgroundColor": background.color = Qt.rgba(value.red, value.green, value.blue, background.color.a); break;
case "font": if (typeof(value) === "Object") {
console.log("Font object");
dumpObject(value)
}
break;
default: default:
console.log("OVERLAY text unhandled property " + key); console.log("OVERLAY text unhandled property " + key);
} }