amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-23 11:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-11-04 21:46:31 +08:00
parent bdbd5d295e
commit 3460b59839
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Qt5/imports/FluentUI/Controls/FluIconButton.qml
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
@ -80,6 +81,7 @@ 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
} }
} }
} }
@ -95,10 +97,11 @@ 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
} }
} }
} }
contentItem:Loader{ contentItem:FluLoader{
sourceComponent: { sourceComponent: {
if(display === Button.TextUnderIcon){ if(display === Button.TextUnderIcon){
return com_column return com_column

3
src/Qt6/imports/FluentUI/Controls/FluIconButton.qml
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
@ -81,6 +82,7 @@ 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
} }
} }
} }
@ -96,6 +98,7 @@ 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
} }
} }
} }