From a88a851f15e24d3e809b7ca7eb86f25e7f042adc Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Fri, 11 May 2018 00:47:04 +0300 Subject: [PATCH] allow specifying fontSize for uit-controls Button, expose impliciTextWidth to allow adjust-to-content type of sizing --- interface/resources/qml/controls-uit/Button.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml index 8d0f513021..1509abdae3 100644 --- a/interface/resources/qml/controls-uit/Button.qml +++ b/interface/resources/qml/controls-uit/Button.qml @@ -19,6 +19,8 @@ Original.Button { property int color: 0 property int colorScheme: hifi.colorSchemes.light + property int fontSize: hifi.fontSizes.buttonLabel + property alias implicitTextWidth: buttonText.implicitWidth property string buttonGlyph: ""; width: hifi.dimensions.buttonWidth @@ -108,7 +110,7 @@ Original.Button { font.capitalization: Font.AllUppercase color: enabled ? hifi.buttons.textColor[control.color] : hifi.buttons.disabledTextColor[control.colorScheme] - size: hifi.fontSizes.buttonLabel + size: control.fontSize verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter text: control.text