Merge pull request #2107

04d0b14 InlineButton: fix warning and set font (selsta)
2019-04-25 13:12:40 -05:00
parent 528aba8724 04d0b14152
commit 8fd8bdcb2f
2 changed files with 1 additions and 2 deletions
--- a/components/InlineButton.qml
+++ b/components/InlineButton.qml
@@ -51,7 +51,7 @@ Item {
    property int rectHMargin: small ? 16 * scaleRatio : 22 * scaleRatio
    property alias text: inlineText.text
    property alias fontPixelSize: inlineText.font.pixelSize
-    property alias fontFamily: inlineText.font
+    property alias fontFamily: inlineText.font.family
    property alias buttonColor: rect.color
    signal clicked()

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