RadioButton: remove a gap between rectangle and text, fix layout

This commit is contained in:
xiphon 2018-12-18 20:45:56 +00:00
parent bac833c1dd
commit 09a49f6392
1 changed files with 13 additions and 22 deletions

View File

@ -31,7 +31,7 @@ import QtQuick.Layouts 1.1
import "../components" as MoneroComponents
RowLayout {
Item {
id: radioButton
property alias text: label.text
property bool checked: false
@ -39,6 +39,7 @@ RowLayout {
property alias fontColor: label.color
signal clicked()
height: 26 * scaleRatio
width: layout.width
// legacy properties
property var checkedColor: "white"
property var borderColor: checked ? Qt.rgba(1, 1, 1, 0.35) : Qt.rgba(1, 1, 1, 0.25)
@ -49,15 +50,14 @@ RowLayout {
}
RowLayout {
Layout.fillWidth: true
id: layout
Rectangle {
id: button
anchors.left: parent.left
y: 0
color: "transparent"
border.color: borderColor
width: radioButton.height
height: radioButton.height
width: radioButton.height
radius: radioButton.height
Rectangle {
@ -70,32 +70,23 @@ RowLayout {
radius: 10
opacity: 0.8
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
toggle()
}
}
}
Text {
id: label
anchors.left: button.right
anchors.leftMargin: !isMobile ? 10 : 8
Layout.leftMargin: (!isMobile ? 10 : 8) * scaleRatio
color: MoneroComponents.Style.defaultFontColor
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: radioButton.fontSize
wrapMode: Text.Wrap
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
toggle()
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
toggle()
}
}
}