diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml index 9ceba38aa2..56324c55d7 100644 --- a/interface/resources/qml/controls-uit/RadioButton.qml +++ b/interface/resources/qml/controls-uit/RadioButton.qml @@ -25,6 +25,8 @@ Original.RadioButton { property int colorScheme: hifi.colorSchemes.light readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light + property real letterSpacing: 1 + property int fontSize: hifi.fontSizes.inputLabel property int boxSize: defaultBoxSize property real scaleFactor: boxSize / defaultBoxSize @@ -81,7 +83,8 @@ Original.RadioButton { contentItem: RalewaySemiBold { text: radioButton.text - size: hifi.fontSizes.inputLabel + size: radioButton.fontSize + font.letterSpacing: letterSpacing color: isLightColorScheme ? hifi.colors.lightGray : hifi.colors.lightGrayText horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml index 9ee87896d1..588609ffdd 100644 --- a/interface/resources/qml/hifi/avatarapp/Settings.qml +++ b/interface/resources/qml/hifi/avatarapp/Settings.qml @@ -74,8 +74,7 @@ Rectangle { spacing: 17 - RalewaySemiBold { - size: 14; + TextStyle9 { text: "Avatar Scale" verticalAlignment: Text.AlignVCenter anchors.verticalCenter: parent.verticalCenter @@ -170,11 +169,10 @@ Rectangle { columns: 3 - RalewaySemiBold { + TextStyle9 { Layout.row: 0 Layout.column: 0 - size: 14; text: "Dominant Hand" } @@ -187,13 +185,15 @@ Rectangle { Layout.row: 0 Layout.column: 1 - Layout.leftMargin: -18 + Layout.leftMargin: -40 ButtonGroup.group: leftRight checked: true colorScheme: hifi.colorSchemes.light - text: "Left hand" + fontSize: 17 + letterSpacing: 1.4 + text: "Left" boxSize: 20 } @@ -202,18 +202,21 @@ Rectangle { Layout.row: 0 Layout.column: 2 + Layout.rightMargin: 20 + ButtonGroup.group: leftRight colorScheme: hifi.colorSchemes.light - text: "Right hand" + fontSize: 17 + letterSpacing: 1.4 + text: "Right" boxSize: 20 } - RalewaySemiBold { + TextStyle9 { Layout.row: 1 Layout.column: 0 - size: 14; text: "Avatar Collisions" } @@ -226,10 +229,12 @@ Rectangle { Layout.row: 1 Layout.column: 1 - Layout.leftMargin: -18 + Layout.leftMargin: -40 ButtonGroup.group: onOff colorScheme: hifi.colorSchemes.light + fontSize: 17 + letterSpacing: 1.4 checked: true text: "ON" @@ -245,8 +250,12 @@ Rectangle { Layout.row: 1 Layout.column: 2 + Layout.rightMargin: 20 + ButtonGroup.group: onOff colorScheme: hifi.colorSchemes.light + fontSize: 17 + letterSpacing: 1.4 text: "OFF" boxSize: 20 @@ -262,8 +271,7 @@ Rectangle { spacing: 4 - RalewaySemiBold { - size: 14; + TextStyle9 { text: "Avatar Animation JSON" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft @@ -271,6 +279,7 @@ Rectangle { InputTextStyle4 { id: avatarAnimationUrlInputText + font.pixelSize: 17 anchors.left: parent.left anchors.right: parent.right placeholderText: 'user\\file\\dir' @@ -286,8 +295,7 @@ Rectangle { spacing: 4 - RalewaySemiBold { - size: 14; + TextStyle9 { text: "Avatar collision sound URL (optional)" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft @@ -295,6 +303,7 @@ Rectangle { InputTextStyle4 { id: avatarCollisionSoundUrlInputText + font.pixelSize: 17 anchors.left: parent.left anchors.right: parent.right placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-' diff --git a/interface/resources/qml/hifi/avatarapp/TextStyle9.qml b/interface/resources/qml/hifi/avatarapp/TextStyle9.qml index cee864bb97..283e7ae1ae 100644 --- a/interface/resources/qml/hifi/avatarapp/TextStyle9.qml +++ b/interface/resources/qml/hifi/avatarapp/TextStyle9.qml @@ -2,6 +2,5 @@ import "../../controls" as HifiControls import "../../styles-uit" RalewaySemiBold { - size: 14; - font.letterSpacing: 1.1 + size: 17; }