monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 20:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1842

Browse source 
09a49f6 RadioButton: remove a gap between rectangle and text, fix layout (xiphon)
This commit is contained in:
luigi1111 2018-12-20 14:32:27 -06:00
commit d6981981d3
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
components/RadioButton.qml
View file

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