diff --git a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml index 7419e371..811ac9e0 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml @@ -45,7 +45,7 @@ T.ComboBox { topPadding: 6 - control.padding bottomPadding: 6 - control.padding renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color text: control.editable ? control.editText : control.displayText enabled: control.editable diff --git a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml index 757c08b4..4f7ec5c9 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import FluentUI 1.0 -TextEdit { +TextInput { property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 id:control color: textColor @@ -17,7 +17,7 @@ TextEdit { selectByMouse: true selectedTextColor: color bottomPadding: 0 - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) font:FluTextStyle.Body onSelectedTextChanged: { control.forceActiveFocus() diff --git a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml index 6b796011..877a3acc 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -24,7 +24,7 @@ TextArea{ leftPadding: padding+4 renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering selectedTextColor: color - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) placeholderTextColor: { if(!enabled){ return placeholderDisableColor diff --git a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml index 8de49ee4..175afa52 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml @@ -25,7 +25,7 @@ TextField{ leftPadding: padding+4 echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color placeholderTextColor: { if(!enabled){ diff --git a/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml b/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml index f478386d..9824f434 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml @@ -39,7 +39,7 @@ T.SpinBox { } return normalColor } - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml index 3ed69afc..fd2749ae 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml @@ -25,7 +25,7 @@ TextField{ } font:FluTextStyle.Body renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color placeholderTextColor: { if(!enabled){ diff --git a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml index f36adb5f..a02840d7 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml @@ -45,7 +45,7 @@ T.ComboBox { topPadding: 6 - control.padding bottomPadding: 6 - control.padding renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color text: control.editable ? control.editText : control.displayText enabled: control.editable diff --git a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml index 9b6346d5..a0042b42 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import FluentUI -TextEdit { +TextInput { property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220 id:control color: textColor @@ -17,7 +17,7 @@ TextEdit { selectByMouse: true selectedTextColor: color bottomPadding: 0 - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) font:FluTextStyle.Body onSelectedTextChanged: { control.forceActiveFocus() diff --git a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml index 9b17689a..5bf243d0 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -25,7 +25,7 @@ TextArea{ leftPadding: padding+4 renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering selectedTextColor: color - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) placeholderTextColor: { if(!enabled){ return placeholderDisableColor diff --git a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml index f1476554..66f7b915 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml @@ -26,7 +26,7 @@ TextField{ leftPadding: padding+4 echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color placeholderTextColor: { if(!enabled){ diff --git a/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml b/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml index 161b18d6..4628d91e 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluSpinBox.qml @@ -40,7 +40,7 @@ T.SpinBox { } return normalColor } - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml index 02b43853..9c00ecc0 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml @@ -26,7 +26,7 @@ TextField{ } font:FluTextStyle.Body renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.25) + selectionColor: FluTools.colorAlpha(FluTheme.primaryColor,0.5) selectedTextColor: color placeholderTextColor: { if(!enabled){