update

2023-11-02 22:14:00 +08:00 · 2023-11-02 20:22:23 +08:00
14 changed files with 38 additions and 14 deletions
--- 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
--- 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()
--- 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
--- a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
@ -342,6 +342,7 @@ Item {
                                }
                                return com_icon
                            }
+                            Component.onDestruction: sourceComponent = undefined
                        }
                    }
                    FluText{
@ -389,6 +390,7 @@ Item {
                            right: item_title.right
                            rightMargin: 8
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        sourceComponent: {
                            if(d.isCompact){
                                return undefined
@ -554,6 +556,7 @@ Item {
                        }
                        Loader{
                            anchors.centerIn: parent
+                            Component.onDestruction: sourceComponent = undefined
                            sourceComponent: {
                                if(model&&model.iconDelegate){
                                    return model.iconDelegate
@ -616,6 +619,7 @@ Item {
                            }
                            return model.showEdit ? model.editDelegate : undefined
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        onStatusChanged: {
                            if(status === Loader.Ready){
                                item.forceActiveFocus()
@ -651,6 +655,7 @@ Item {
                            }
                            return undefined
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        Connections{
                            target: d
                            function onIsCompactAndNotPanelChanged(){
@ -784,6 +789,7 @@ Item {
                id:loader_action
                anchors.centerIn: parent
                sourceComponent: actionItem
+                Component.onDestruction: sourceComponent = undefined
            }
        }
    }
@ -839,6 +845,7 @@ Item {
                return control.cellWidth
            }
        }
+        Component.onDestruction: sourceComponent = undefined
        Behavior on anchors.leftMargin {
            enabled: FluTheme.enableAnimation && d.animDisabled
            NumberAnimation{
@ -918,6 +925,7 @@ Item {
                    rightMargin: 6
                    verticalCenter: parent.verticalCenter
                }
+                Component.onDestruction: sourceComponent = undefined
                visible: {
                    if(d.isCompactAndNotPanel){
                        return false
@ -989,6 +997,7 @@ Item {
                    property var model: modelData
                    property var _idx: index
                    property int type: 0
+                    Component.onDestruction: sourceComponent = undefined
                    sourceComponent: {
                        if(model === null || !model)
                            return undefined
@ -1046,6 +1055,7 @@ Item {
                property var model: modelData
                property var _idx: index
                property int type: 1
+                Component.onDestruction: sourceComponent = undefined
                sourceComponent: {
                    if(modelData instanceof FluPaneItem){
                        return com_panel_item
@ -1114,6 +1124,7 @@ Item {
                                verticalCenter: parent.verticalCenter
                                rightMargin: 10
                            }
+                            Component.onDestruction: sourceComponent = undefined
                            sourceComponent: {
                                if(model.infoBadge){
                                    return model.infoBadge
@ -1166,6 +1177,7 @@ Item {
    }
    Loader{
        property var modelData
+        Component.onDestruction: sourceComponent = undefined
        id:loader_item_menu
    }
    Connections{
--- 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){
--- 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
--- 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){
--- 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
--- 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()
--- 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
--- a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
@ -343,6 +343,7 @@ Item {
                                }
                                return com_icon
                            }
+                            Component.onDestruction: sourceComponent = undefined
                        }
                    }
                    FluText{
@ -390,6 +391,7 @@ Item {
                            right: item_title.right
                            rightMargin: 8
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        sourceComponent: {
                            if(d.isCompact){
                                return undefined
@ -555,6 +557,7 @@ Item {
                        }
                        Loader{
                            anchors.centerIn: parent
+                            Component.onDestruction: sourceComponent = undefined
                            sourceComponent: {
                                if(model&&model.iconDelegate){
                                    return model.iconDelegate
@ -617,6 +620,7 @@ Item {
                            }
                            return model.showEdit ? model.editDelegate : undefined
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        onStatusChanged: {
                            if(status === Loader.Ready){
                                item.forceActiveFocus()
@ -652,6 +656,7 @@ Item {
                            }
                            return undefined
                        }
+                        Component.onDestruction: sourceComponent = undefined
                        Connections{
                            target: d
                            function onIsCompactAndNotPanelChanged(){
@ -785,6 +790,7 @@ Item {
                id:loader_action
                anchors.centerIn: parent
                sourceComponent: actionItem
+                Component.onDestruction: sourceComponent = undefined
            }
        }
    }
@ -840,6 +846,7 @@ Item {
                return control.cellWidth
            }
        }
+        Component.onDestruction: sourceComponent = undefined
        Behavior on anchors.leftMargin {
            enabled: FluTheme.enableAnimation && d.animDisabled
            NumberAnimation{
@ -919,6 +926,7 @@ Item {
                    rightMargin: 6
                    verticalCenter: parent.verticalCenter
                }
+                Component.onDestruction: sourceComponent = undefined
                visible: {
                    if(d.isCompactAndNotPanel){
                        return false
@ -990,6 +998,7 @@ Item {
                    property var model: modelData
                    property var _idx: index
                    property int type: 0
+                    Component.onDestruction: sourceComponent = undefined
                    sourceComponent: {
                        if(model === null || !model)
                            return undefined
@ -1047,6 +1056,7 @@ Item {
                property var model: modelData
                property var _idx: index
                property int type: 1
+                Component.onDestruction: sourceComponent = undefined
                sourceComponent: {
                    if(modelData instanceof FluPaneItem){
                        return com_panel_item
@ -1115,6 +1125,7 @@ Item {
                                verticalCenter: parent.verticalCenter
                                rightMargin: 10
                            }
+                            Component.onDestruction: sourceComponent = undefined
                            sourceComponent: {
                                if(model.infoBadge){
                                    return model.infoBadge
@ -1167,6 +1178,7 @@ Item {
    }
    Loader{
        property var modelData
+        Component.onDestruction: sourceComponent = undefined
        id:loader_item_menu
    }
    Connections{
--- 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){
--- 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
--- 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){
Author	SHA1	Message	Date
$朱子楚\zhuzi$ 朱子楚\zhuzi	eef46a2dac	update	2023-11-02 22:14:00 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	f856fd44c1	update	2023-11-02 20:22:23 +08:00