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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-12-02 23:29:55 +08:00
parent bcc47c1496
commit 1a21cd7b31
10 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Qt5/imports/FluentUI/Controls/FluButton.qml
View File

@ -6,8 +6,8 @@ Button {
property bool disabled: false property bool disabled: false
property string contentDescription: "" property string contentDescription: ""
property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
property color textColor: { property color textColor: {
if(FluTheme.dark){ if(FluTheme.dark){
if(!enabled){ if(!enabled){
@ -33,6 +33,7 @@ Button {
Accessible.onPressAction: control.clicked() Accessible.onPressAction: control.clicked()
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
font:FluTextStyle.Body font:FluTextStyle.Body
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus

5
src/Qt5/imports/FluentUI/Controls/FluDropDownButton.qml
View File

@ -7,8 +7,8 @@ Button {
property bool disabled: false property bool disabled: false
property string contentDescription: "" property string contentDescription: ""
property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
property color textColor: { property color textColor: {
if(FluTheme.dark){ if(FluTheme.dark){
if(!enabled){ if(!enabled){
@ -38,6 +38,7 @@ Button {
rightPadding:35 rightPadding:35
enabled: !disabled enabled: !disabled
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: Rectangle{ background: Rectangle{
implicitWidth: 28 implicitWidth: 28

1
src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
View File

@ -27,6 +27,7 @@ Button {
enabled: !disabled enabled: !disabled
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
font:FluTextStyle.Body font:FluTextStyle.Body
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: Rectangle{ background: Rectangle{
implicitWidth: 28 implicitWidth: 28

7
src/Qt5/imports/FluentUI/Controls/FluProgressButton.qml
View File

@ -21,14 +21,14 @@ Button {
if(d.checked){ if(d.checked){
return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1) return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
} }
} }
property color disableColor: { property color disableColor: {
if(d.checked){ if(d.checked){
return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1) return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
} }
} }
property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2) property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2)
@ -39,6 +39,7 @@ Button {
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: FluClip{ background: FluClip{
implicitWidth: 28 implicitWidth: 28
@ -69,7 +70,7 @@ Button {
color: FluTheme.primaryColor color: FluTheme.primaryColor
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
Behavior on height{ Behavior on height{
enabled: control.progress !== 1 enabled: control.progress === 1
SequentialAnimation { SequentialAnimation {
PauseAnimation { PauseAnimation {
duration: FluTheme.enableAnimation ? 167 : 0 duration: FluTheme.enableAnimation ? 167 : 0

5
src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
View File

@ -16,14 +16,14 @@ Button {
if(checked){ if(checked){
return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1) return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
} }
} }
property color disableColor: { property color disableColor: {
if(checked){ if(checked){
return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1) return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
} }
} }
property var clickListener : function(){ property var clickListener : function(){
@ -37,6 +37,7 @@ Button {
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
onClicked: clickListener() onClicked: clickListener()
onCheckableChanged: { onCheckableChanged: {

5
src/Qt6/imports/FluentUI/Controls/FluButton.qml
View File

@ -7,8 +7,8 @@ Button {
property bool disabled: false property bool disabled: false
property string contentDescription: "" property string contentDescription: ""
property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
property color textColor: { property color textColor: {
if(FluTheme.dark){ if(FluTheme.dark){
if(!enabled){ if(!enabled){
@ -34,6 +34,7 @@ Button {
Accessible.onPressAction: control.clicked() Accessible.onPressAction: control.clicked()
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
font:FluTextStyle.Body font:FluTextStyle.Body
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus

5
src/Qt6/imports/FluentUI/Controls/FluDropDownButton.qml
View File

@ -8,8 +8,8 @@ Button {
property bool disabled: false property bool disabled: false
property string contentDescription: "" property string contentDescription: ""
property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1) property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
property color textColor: { property color textColor: {
if(FluTheme.dark){ if(FluTheme.dark){
if(!enabled){ if(!enabled){
@ -39,6 +39,7 @@ Button {
rightPadding:35 rightPadding:35
enabled: !disabled enabled: !disabled
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: Rectangle{ background: Rectangle{
implicitWidth: 28 implicitWidth: 28

1
src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
View File

@ -28,6 +28,7 @@ Button {
enabled: !disabled enabled: !disabled
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
font:FluTextStyle.Body font:FluTextStyle.Body
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: Rectangle{ background: Rectangle{
implicitWidth: 28 implicitWidth: 28

5
src/Qt6/imports/FluentUI/Controls/FluProgressButton.qml
View File

@ -22,14 +22,14 @@ Button {
if(d.checked){ if(d.checked){
return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1) return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
} }
} }
property color disableColor: { property color disableColor: {
if(d.checked){ if(d.checked){
return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1) return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
} }
} }
property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2) property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2)
@ -40,6 +40,7 @@ Button {
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
background: FluClip{ background: FluClip{
implicitWidth: 28 implicitWidth: 28

5
src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
View File

@ -17,14 +17,14 @@ Button {
if(checked){ if(checked){
return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1) return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1) return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(246/255,246/255,246/255,1)
} }
} }
property color disableColor: { property color disableColor: {
if(checked){ if(checked){
return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1) return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
}else{ }else{
return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1) return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(244/255,244/255,244/255,1)
} }
} }
property var clickListener : function(){ property var clickListener : function(){
@ -38,6 +38,7 @@ Button {
focusPolicy:Qt.TabFocus focusPolicy:Qt.TabFocus
id: control id: control
enabled: !disabled enabled: !disabled
verticalPadding: 0
horizontalPadding:12 horizontalPadding:12
onClicked: clickListener() onClicked: clickListener()
background: Rectangle{ background: Rectangle{