diff --git a/interface/resources/qml/hifi/overlays/RectangleOverlay.qml b/interface/resources/qml/hifi/overlays/RectangleOverlay.qml index 0ea9b1a2a9..fc4169103a 100644 --- a/interface/resources/qml/hifi/overlays/RectangleOverlay.qml +++ b/interface/resources/qml/hifi/overlays/RectangleOverlay.qml @@ -25,9 +25,9 @@ Overlay { case "y": root.y = value; break; case "visible": root.visible = 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 "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 "radius": rectangle.radius = value; break; default: console.log("OVERLAY Unhandled rectangle property " + key); diff --git a/interface/resources/qml/hifi/overlays/TextOverlay.qml b/interface/resources/qml/hifi/overlays/TextOverlay.qml index 21b4fddda9..ba5cafdf64 100644 --- a/interface/resources/qml/hifi/overlays/TextOverlay.qml +++ b/interface/resources/qml/hifi/overlays/TextOverlay.qml @@ -23,6 +23,7 @@ Overlay { } } + function updatePropertiesFromScript(properties) { var keys = Object.keys(properties); for (var i = 0; i < keys.length; ++i) { @@ -38,23 +39,13 @@ Overlay { case "margin": textField.anchors.margins = value; break; case "leftMargin": textField.anchors.leftMargin = value; break; case "topMargin": textField.anchors.topMargin = value; break; - case "color": - case "textColor": textField.color = Qt.rgba(value.red, value.green, value.blue, textField.color.a); break; + case "color": // fall through + 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 "backgroundAlpha": - if ("object" === typeof(value)) { - console.log("OVERLAY Unexpected object for alpha"); - dumpObject(value) - } 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; + case "backgroundAlpha": background.color = Qt.rgba(background.color.r, background.color.g, background.color.b, value); break; + case "backgroundColor": background.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, background.color.a); break; + case "font": textField.font.pixelSize = value.size; break; + case "lineHeight": textField.lineHeight = value; break; default: console.log("OVERLAY text unhandled property " + key); }