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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-11-02 20:22:23 +08:00
parent 35bfb8021f
commit f856fd44c1
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -45,7 +45,7 @@ T.ComboBox {
topPadding: 6 - control.padding topPadding: 6 - control.padding
bottomPadding: 6 - control.padding bottomPadding: 6 - control.padding
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
text: control.editable ? control.editText : control.displayText text: control.editable ? control.editText : control.displayText
enabled: control.editable enabled: control.editable

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

@ -2,7 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import FluentUI 1.0 import FluentUI 1.0
TextEdit { TextInput {
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
id:control id:control
color: textColor color: textColor
@ -17,7 +17,7 @@ TextEdit {
selectByMouse: true selectByMouse: true
selectedTextColor: color selectedTextColor: color
bottomPadding: 0 bottomPadding: 0
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
font:FluTextStyle.Body font:FluTextStyle.Body
onSelectedTextChanged: { onSelectedTextChanged: {
control.forceActiveFocus() control.forceActiveFocus()

2
src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -24,7 +24,7 @@ TextArea{
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectedTextColor: color selectedTextColor: color
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){
return placeholderDisableColor return placeholderDisableColor

2
src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
View File

@ -25,7 +25,7 @@ TextField{
leftPadding: padding+4 leftPadding: padding+4
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

2
src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml
View File

@ -39,7 +39,7 @@ T.SpinBox {
} }
return normalColor return normalColor
} }
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter

2
src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -25,7 +25,7 @@ TextField{
} }
font:FluTextStyle.Body font:FluTextStyle.Body
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

2
src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
View File

@ -45,7 +45,7 @@ T.ComboBox {
topPadding: 6 - control.padding topPadding: 6 - control.padding
bottomPadding: 6 - control.padding bottomPadding: 6 - control.padding
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
text: control.editable ? control.editText : control.displayText text: control.editable ? control.editText : control.displayText
enabled: control.editable enabled: control.editable

4
src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import FluentUI import FluentUI
TextEdit { TextInput {
property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
id:control id:control
color: textColor color: textColor
@ -17,7 +17,7 @@ TextEdit {
selectByMouse: true selectByMouse: true
selectedTextColor: color selectedTextColor: color
bottomPadding: 0 bottomPadding: 0
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
font:FluTextStyle.Body font:FluTextStyle.Body
onSelectedTextChanged: { onSelectedTextChanged: {
control.forceActiveFocus() control.forceActiveFocus()

2
src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -25,7 +25,7 @@ TextArea{
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectedTextColor: color selectedTextColor: color
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){
return placeholderDisableColor return placeholderDisableColor

2
src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
View File

@ -26,7 +26,7 @@ TextField{
leftPadding: padding+4 leftPadding: padding+4
echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){

2
src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml
View File

@ -40,7 +40,7 @@ T.SpinBox {
} }
return normalColor return normalColor
} }
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter verticalAlignment: Qt.AlignVCenter

2
src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -26,7 +26,7 @@ TextField{
} }
font:FluTextStyle.Body font:FluTextStyle.Body
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5)
selectedTextColor: color selectedTextColor: color
placeholderTextColor: { placeholderTextColor: {
if(!enabled){ if(!enabled){