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

修复icon按钮，单选按钮等控件disable后，控件文本仍然高亮问题

Browse Source 
为flutext 和 fluicon增加disable时的alpha值，简化其他控件中对text的disable时颜色的独立控制
This commit is contained in:
ToMoree 2024-11-06 10:13:07 +08:00
parent d82e0ed529
commit 875bba2bd6
9 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/example_en_US.ts
View File

@ -902,7 +902,7 @@ Updated content:
<location filename="qml/page/T_Buttons.qml" line="199"/>
<location filename="qml/page/T_Buttons.qml" line="320"/>
<location filename="qml/page/T_Buttons.qml" line="368"/>
<location filename="qml/page/T_Buttons.qml" line="421"/>
<location filename="qml/page/T_Buttons.qml" line="422"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@ -1017,17 +1017,17 @@ Updated content:
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="404"/>
<location filename="qml/page/T_Buttons.qml" line="405"/>
<source>Radio Button_1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="408"/>
<location filename="qml/page/T_Buttons.qml" line="409"/>
<source>Radio Button_2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="412"/>
<location filename="qml/page/T_Buttons.qml" line="413"/>
<source>Radio Button_3</source>
<translation type="unfinished"></translation>
</message>

8
example/example_zh_CN.ts
View File

@ -929,7 +929,7 @@ Updated content:
<location filename="qml/page/T_Buttons.qml" line="199"/>
<location filename="qml/page/T_Buttons.qml" line="320"/>
<location filename="qml/page/T_Buttons.qml" line="368"/>
<location filename="qml/page/T_Buttons.qml" line="421"/>
<location filename="qml/page/T_Buttons.qml" line="422"/>
<source>Disabled</source>
<translation type="unfinished">禁用</translation>
</message>
@ -1044,17 +1044,17 @@ Updated content:
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="404"/>
<location filename="qml/page/T_Buttons.qml" line="405"/>
<source>Radio Button_1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="408"/>
<location filename="qml/page/T_Buttons.qml" line="409"/>
<source>Radio Button_2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_Buttons.qml" line="412"/>
<location filename="qml/page/T_Buttons.qml" line="413"/>
<source>Radio Button_3</source>
<translation type="unfinished"></translation>
</message>

5
example/qml/page/T_Buttons.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import QtQuick.Controls 2.15
@ -265,7 +265,7 @@ FluScrollablePage{
}
FluIconButton{
disabled: icon_button_switch.checked
iconDelegate: Image{ sourceSize: Qt.size(40,40) ; width: 20; height: 20; source: "qrc:/example/res/image/ic_home_github.png" }
iconDelegate: FluImage{ sourceSize: Qt.size(40,40) ; width: 20; height: 20; source: "qrc:/example/res/image/ic_home_github.png" }
onClicked:{
showSuccess(qsTr("Click IconButton"))
}
@ -395,6 +395,7 @@ FluScrollablePage{
Layout.topMargin: 20
FluRadioButtons{
spacing: 8
disabled: radio_button_switch.checked
anchors{
verticalCenter: parent.verticalCenter
left: parent.left

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

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
@ -11,17 +11,11 @@ Button {
property color dividerColor: FluTheme.dark ? Qt.rgba(80/255,80/255,80/255,1) : Qt.rgba(233/255,233/255,233/255,1)
property color textColor: {
if(FluTheme.dark){
if(!enabled){
return Qt.rgba(131/255,131/255,131/255,1)
}
if(pressed){
return Qt.rgba(162/255,162/255,162/255,1)
}
return Qt.rgba(1,1,1,1)
}else{
if(!enabled){
return Qt.rgba(160/255,160/255,160/255,1)
}
if(pressed){
return Qt.rgba(96/255,96/255,96/255,1)
}
@ -59,6 +53,6 @@ Button {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font: control.font
color: control.textColor
textColor: control.textColor
}
}

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

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
@ -11,7 +11,8 @@ Text {
font.pixelSize: iconSize
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: iconColor
color: enabled ? iconColor : Qt.rgba(iconColor.r, iconColor.g, iconColor.b, iconColor.a * 0.5)
text: (String.fromCharCode(iconSource).toString(16))
opacity: iconSource>0
FontLoader{

12
src/Qt5/imports/FluentUI/Controls/FluIconButton.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import FluentUI 1.0
@ -26,14 +26,8 @@ Button {
}
property color iconColor: {
if(FluTheme.dark){
if(!enabled){
return Qt.rgba(130/255,130/255,130/255,1)
}
return Qt.rgba(1,1,1,1)
}else{
if(!enabled){
return Qt.rgba(161/255,161/255,161/255,1)
}
return Qt.rgba(0,0,0,1)
}
}
@ -82,7 +76,7 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
textColor: control.textColor
font: control.font
}
}
@ -99,7 +93,7 @@ Button {
text:control.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
visible: display !== Button.IconOnly
color: control.textColor
textColor: control.textColor
font: control.font
}
}

3
src/Qt5/imports/FluentUI/Controls/FluImage.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
@ -11,6 +11,7 @@ Image {
property Component errorItem : com_error
property Component loadingItem: com_loading
id: control
opacity: enabled ? 1 : 0.5
FluLoader{
anchors.fill: parent
sourceComponent: {

4
src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
@ -13,7 +13,7 @@ FluButton {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font: control.font
color: control.textColor
textColor: control.textColor
anchors.verticalCenter: parent.verticalCenter
}
Item{

4
src/Qt5/imports/FluentUI/Controls/FluText.qml
View File

@ -1,11 +1,11 @@
import QtQuick 2.15
import QtQuick 2.15
import QtQuick.Controls 2.15
import FluentUI 1.0
Text {
property color textColor: FluTheme.fontPrimaryColor
id:text
color: textColor
color: enabled ? textColor : Qt.rgba(textColor.r, textColor.g, textColor.b, textColor.a * 0.7)
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
font: FluTextStyle.Body
}