Compare commits

..

3 Commits

Author SHA1 Message Date
朱子楚\zhuzi 661529f1f4 update 2023-11-04 22:06:05 +08:00
朱子楚\zhuzi 139c5c455d update 2023-11-04 21:58:21 +08:00
朱子楚\zhuzi 3460b59839 update 2023-11-04 21:46:31 +08:00
2 changed files with 13 additions and 1 deletions

View File

@ -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

View File

@ -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
} }
} }
} }