diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml index 21d93274da..6f6beeae99 100644 --- a/interface/resources/qml/hifi/AvatarApp.qml +++ b/interface/resources/qml/hifi/AvatarApp.qml @@ -268,7 +268,8 @@ Rectangle { InputField { id: displayNameInput - font.pixelSize: 18 + font.family: "Fira Sans" + font.pixelSize: 15 anchors.left: displayNameLabel.right anchors.leftMargin: 30 anchors.verticalCenter: displayNameLabel.verticalCenter diff --git a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml index 3b1ea411e4..4b868b47ce 100644 --- a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml +++ b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml @@ -8,6 +8,7 @@ HifiControlsUit.TextField { id: control font.family: "Fira Sans" font.pixelSize: 15; + implicitHeight: 40 AvatarAppStyle { id: style diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml index 562643e685..9ee87896d1 100644 --- a/interface/resources/qml/hifi/avatarapp/Settings.qml +++ b/interface/resources/qml/hifi/avatarapp/Settings.qml @@ -101,6 +101,22 @@ Rectangle { to: 30 anchors.verticalCenter: parent.verticalCenter Layout.fillWidth: true + + TextStyle9 { + anchors.left: scaleSlider.left + anchors.leftMargin: 5 + anchors.top: scaleSlider.bottom + anchors.topMargin: 2 + text: String(scaleSlider.from / 10) + 'x' + } + + TextStyle9 { + anchors.right: scaleSlider.right + anchors.rightMargin: 5 + anchors.top: scaleSlider.bottom + anchors.topMargin: 2 + text: String(scaleSlider.to / 10) + 'x' + } } HiFiGlyphs { @@ -113,22 +129,31 @@ Rectangle { } ShadowRectangle { - width: 28 + width: 37 height: 28 - color: 'white' + AvatarAppStyle { + id: style + } + + gradient: Gradient { + GradientStop { position: 0.0; color: style.colors.blueHighlight } + GradientStop { position: 1.0; color: style.colors.blueAccent } + } radius: 3 - border.color: 'black' - border.width: 1.5 - anchors.verticalCenter: parent.verticalCenter RalewaySemiBold { - size: 13; + color: 'white' + anchors.centerIn: parent text: "1x" - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + size: 18 + } + + MouseArea { + anchors.fill: parent + onClicked: { + scaleSlider.value = 10 + } } } }