diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 13:12:40 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-25 13:12:40 -0500 |
| commit | 8fd8bdcb2fa7efd32e69da8cf5fd18514e52e88d (patch) | |
| tree | c5a5a3489ff5b0352eb7b0574fa1b235ea116c8e /components | |
| parent | 528aba8724cc26bda665c27431671f4d0a7b528d (diff) | |
| parent | 04d0b141521bc7189a34657c7bb070915eb7ce22 (diff) | |
| download | monzero-gui-8fd8bdcb2fa7efd32e69da8cf5fd18514e52e88d.tar.gz monzero-gui-8fd8bdcb2fa7efd32e69da8cf5fd18514e52e88d.tar.xz monzero-gui-8fd8bdcb2fa7efd32e69da8cf5fd18514e52e88d.zip | |
Merge pull request #2107
04d0b14 InlineButton: fix warning and set font (selsta)
Diffstat (limited to 'components')
| -rw-r--r-- | components/InlineButton.qml | 2 | ||||
| -rw-r--r-- | components/LineEditMulti.qml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/components/InlineButton.qml b/components/InlineButton.qml index 5871a8ff..c7c68bac 100644 --- 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() diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index 26d57509..f95961cb 100644 --- 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 } } } |