Compare commits
3 Commits
bdbd5d295e
...
661529f1f4
Author | SHA1 | Date |
---|---|---|
|
661529f1f4 | |
|
139c5c455d | |
|
3460b59839 |
|
@ -37,6 +37,7 @@ Button {
|
||||||
return Qt.rgba(0,0,0,1)
|
return Qt.rgba(0,0,0,1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
property color textColor: FluTheme.fontPrimaryColor
|
||||||
Accessible.role: Accessible.Button
|
Accessible.role: Accessible.Button
|
||||||
Accessible.name: control.text
|
Accessible.name: control.text
|
||||||
Accessible.description: contentDescription
|
Accessible.description: contentDescription
|
||||||
|
@ -47,6 +48,7 @@ Button {
|
||||||
verticalPadding: 8
|
verticalPadding: 8
|
||||||
horizontalPadding: 8
|
horizontalPadding: 8
|
||||||
enabled: !disabled
|
enabled: !disabled
|
||||||
|
font:FluTextStyle.Caption
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
implicitWidth: 30
|
implicitWidth: 30
|
||||||
implicitHeight: 30
|
implicitHeight: 30
|
||||||
|
@ -80,6 +82,8 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
|
color: control.textColor
|
||||||
|
font: control.font
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -95,10 +99,12 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
|
color: control.textColor
|
||||||
|
font: control.font
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
contentItem:Loader{
|
contentItem:FluLoader{
|
||||||
sourceComponent: {
|
sourceComponent: {
|
||||||
if(display === Button.TextUnderIcon){
|
if(display === Button.TextUnderIcon){
|
||||||
return com_column
|
return com_column
|
||||||
|
|
|
@ -38,6 +38,7 @@ Button {
|
||||||
return Qt.rgba(0,0,0,1)
|
return Qt.rgba(0,0,0,1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
property color textColor: FluTheme.fontPrimaryColor
|
||||||
Accessible.role: Accessible.Button
|
Accessible.role: Accessible.Button
|
||||||
Accessible.name: control.text
|
Accessible.name: control.text
|
||||||
Accessible.description: contentDescription
|
Accessible.description: contentDescription
|
||||||
|
@ -48,6 +49,7 @@ Button {
|
||||||
verticalPadding: 8
|
verticalPadding: 8
|
||||||
horizontalPadding: 8
|
horizontalPadding: 8
|
||||||
enabled: !disabled
|
enabled: !disabled
|
||||||
|
font:FluTextStyle.Caption
|
||||||
background: Rectangle{
|
background: Rectangle{
|
||||||
implicitWidth: 30
|
implicitWidth: 30
|
||||||
implicitHeight: 30
|
implicitHeight: 30
|
||||||
|
@ -81,6 +83,8 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
|
color: control.textColor
|
||||||
|
font: control.font
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -96,6 +100,8 @@ Button {
|
||||||
text:control.text
|
text:control.text
|
||||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||||
visible: display !== Button.IconOnly
|
visible: display !== Button.IconOnly
|
||||||
|
color: control.textColor
|
||||||
|
font: control.font
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue