mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-07-03 00:25:25 +08:00
修复部分控件在禁用后错误高亮的问题
涉及控件如下:FluCheckBox、FluCopyableText、FluIcon、FluIconButton、FluRadioButton、FluText、FluToggleSwitch
This commit is contained in:
@ -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="419"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -1022,12 +1022,12 @@ Updated content:
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Buttons.qml" line="408"/>
|
||||
<location filename="qml/page/T_Buttons.qml" line="407"/>
|
||||
<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="410"/>
|
||||
<source>Radio Button_3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -1421,7 +1421,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Icons.qml" line="51"/>
|
||||
<location filename="qml/page/T_Icons.qml" line="28"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Icons.qml" line="61"/>
|
||||
<source>You Copied </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -2185,10 +2190,15 @@ Some contents...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Text.qml" line="18"/>
|
||||
<location filename="qml/page/T_Text.qml" line="19"/>
|
||||
<source>This is a text that can be copied</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Text.qml" line="29"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_TextBox</name>
|
||||
|
@ -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="419"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished">禁用</translation>
|
||||
</message>
|
||||
@ -1049,12 +1049,12 @@ Updated content:
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Buttons.qml" line="408"/>
|
||||
<location filename="qml/page/T_Buttons.qml" line="407"/>
|
||||
<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="410"/>
|
||||
<source>Radio Button_3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@ -1538,12 +1538,17 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
||||
<source>Please enter a keyword</source>
|
||||
<translation type="unfinished">请输入关键字</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Icons.qml" line="28"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished">禁用</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Search</source>
|
||||
<translation type="obsolete">搜索</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Icons.qml" line="51"/>
|
||||
<location filename="qml/page/T_Icons.qml" line="61"/>
|
||||
<source>You Copied </source>
|
||||
<translation type="unfinished">您复制</translation>
|
||||
</message>
|
||||
@ -2367,10 +2372,15 @@ Some contents...</source>
|
||||
<translation type="unfinished">文本</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Text.qml" line="18"/>
|
||||
<location filename="qml/page/T_Text.qml" line="19"/>
|
||||
<source>This is a text that can be copied</source>
|
||||
<translation type="unfinished">这是一个可以复制的文本</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="qml/page/T_Text.qml" line="29"/>
|
||||
<source>Disabled</source>
|
||||
<translation type="unfinished">禁用</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>T_TextBox</name>
|
||||
|
@ -399,16 +399,14 @@ FluScrollablePage{
|
||||
verticalCenter: parent.verticalCenter
|
||||
left: parent.left
|
||||
}
|
||||
disabled: radio_button_switch.checked
|
||||
FluRadioButton{
|
||||
disabled:radio_button_switch.checked
|
||||
text: qsTr("Radio Button_1")
|
||||
}
|
||||
FluRadioButton{
|
||||
disabled:radio_button_switch.checked
|
||||
text: qsTr("Radio Button_2")
|
||||
}
|
||||
FluRadioButton{
|
||||
disabled:radio_button_switch.checked
|
||||
text: qsTr("Radio Button_3")
|
||||
}
|
||||
}
|
||||
|
@ -18,6 +18,15 @@ FluContentPage {
|
||||
grid_view.model = FluApp.iconData(text_box.text)
|
||||
}
|
||||
}
|
||||
FluToggleSwitch{
|
||||
id: toggle_switch
|
||||
anchors{
|
||||
left: text_box.right
|
||||
verticalCenter: text_box.verticalCenter
|
||||
leftMargin: 10
|
||||
}
|
||||
text: qsTr("Disabled")
|
||||
}
|
||||
GridView{
|
||||
id: grid_view
|
||||
cellWidth: 110
|
||||
@ -45,6 +54,7 @@ FluContentPage {
|
||||
horizontalPadding: 0
|
||||
bottomPadding: 30
|
||||
anchors.fill: parent
|
||||
disabled: toggle_switch.checked
|
||||
onClicked: {
|
||||
var text ="FluentIcons."+modelData.name;
|
||||
FluTools.clipText(text)
|
||||
@ -57,6 +67,7 @@ FluContentPage {
|
||||
text: modelData.name
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 60
|
||||
enabled: !toggle_switch.checked
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -15,10 +15,19 @@ FluScrollablePage{
|
||||
padding: 10
|
||||
|
||||
FluCopyableText{
|
||||
enabled: !toggle_switch.checked
|
||||
text: qsTr("This is a text that can be copied")
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
|
||||
FluToggleSwitch{
|
||||
id: toggle_switch
|
||||
anchors{
|
||||
right: parent.right
|
||||
verticalCenter: parent.verticalCenter
|
||||
}
|
||||
text: qsTr("Disabled")
|
||||
}
|
||||
}
|
||||
CodeExpander{
|
||||
Layout.fillWidth: true
|
||||
|
Reference in New Issue
Block a user