Merge branch 'master' into topic-update-nosync

linuxdeepin · Oct 16, 2024 · 880a5ff · 880a5ff
2 parents 6d18650 + 68199d7
commit 880a5ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/qt6/src/qml/TextField.qml b/qt6/src/qml/TextField.qml
@@ -30,22 +30,21 @@ T.TextField {
     verticalAlignment: TextInput.AlignVCenter
     onEffectiveHorizontalAlignmentChanged: placeholder.effectiveHorizontalAlignmentChanged()
 
-    Loader {
+    // use Loader will cause placeholdertext horizontalAlignment not work
+    // QQuickPlaceholderText will assume it's parent item is QQuickTextInput or QQuickTextInput
+    // see QQuickPlaceholderText::updateAlignment()
+    PlaceholderText {
         id: placeholder
-        active: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
         x: control.leftPadding
         y: control.topPadding
         width: control.width - (control.leftPadding + control.rightPadding)
         height: control.height - (control.topPadding + control.bottomPadding)
-        signal effectiveHorizontalAlignmentChanged
-
-        sourceComponent: PlaceholderText {
-            text: control.placeholderText
-            font: control.font
-            color: control.placeholderTextColor
-            verticalAlignment: control.verticalAlignment
-            renderType: control.renderType
-        }
+        text: control.placeholderText
+        visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
+        font: control.font
+        color: control.placeholderTextColor
+        verticalAlignment: control.verticalAlignment
+        renderType: control.renderType
     }
 
     background: EditPanel {

diff --git a/src/dtkdeclarative_assets.qrc b/src/dtkdeclarative_assets.qrc
@@ -37,6 +37,7 @@
         <file alias="built-in-icons/slider_point_left.dci">icons/bloom/slider_point_left.dci</file>
         <file alias="built-in-icons/slider_round_hor.dci">icons/bloom/slider_round_hor.dci</file>
         <file alias="built-in-icons/slider_round_ver.dci">icons/bloom/slider_round_ver.dci</file>
+        <file alias="built-in-icons/switch_button.dci">icons/bloom/switch_button.dci</file>
         <file alias="built-in-icons/switch_on.dci">icons/bloom/switch_on.dci</file>
         <file alias="built-in-icons/switch_off.dci">icons/bloom/switch_off.dci</file>
         <file alias="built-in-icons/slider_point_up.dci">icons/bloom/slider_point_up.dci</file>