Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 19:40:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow specifying fontSize for uit-controls Button, expose impliciTextWidth to allow adjust-to-content type of sizing

Browse source
This commit is contained in:
Alexander Ivash 2018-05-11 00:47:04 +03:00
parent 5ebe26887d
commit a88a851f15
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/controls-uit/Button.qml
View file

@ -19,6 +19,8 @@ Original.Button {
property int color: 0 property int color: 0
property int colorScheme: hifi.colorSchemes.light property int colorScheme: hifi.colorSchemes.light
property int fontSize: hifi.fontSizes.buttonLabel
property alias implicitTextWidth: buttonText.implicitWidth
property string buttonGlyph: ""; property string buttonGlyph: "";
width: hifi.dimensions.buttonWidth width: hifi.dimensions.buttonWidth
@ -108,7 +110,7 @@ Original.Button {
font.capitalization: Font.AllUppercase font.capitalization: Font.AllUppercase
color: enabled ? hifi.buttons.textColor[control.color] color: enabled ? hifi.buttons.textColor[control.color]
: hifi.buttons.disabledTextColor[control.colorScheme] : hifi.buttons.disabledTextColor[control.colorScheme]
size: hifi.fontSizes.buttonLabel size: control.fontSize
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: control.text text: control.text