Merge pull request #2107

04d0b14 InlineButton: fix warning and set font (selsta)
This commit is contained in:
luigi1111 2019-04-25 13:12:40 -05:00
commit 8fd8bdcb2f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 1 additions and 2 deletions

View file

@ -51,7 +51,7 @@ Item {
property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio
property alias text: inlineText.text property alias text: inlineText.text
property alias fontPixelSize: inlineText.font.pixelSize property alias fontPixelSize: inlineText.font.pixelSize
property alias fontFamily: inlineText.font property alias fontFamily: inlineText.font.family
property alias buttonColor: rect.color property alias buttonColor: rect.color
signal clicked() signal clicked()

View file

@ -201,7 +201,6 @@ ColumnLayout {
visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 * scaleRatio anchors.rightMargin: 8 * scaleRatio
anchors.verticalCenter: parent.verticalCenter
} }
} }
} }