sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#462
linuxdeepin · Feb 24, 2025 · 664051a · 664051a
1 parent 5f0458a
commit 664051a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/qt6/src/qml/ComboBox.qml b/qt6/src/qml/ComboBox.qml
@@ -148,6 +148,11 @@ T.ComboBox {
                 }
             }
         }
+        Loader {
+            anchors.fill: parent
+            active: control.flat && control.visualFocus
+            sourceComponent: FocusBoxBorder {}
+        }
     }
 
     popup: Popup {

diff --git a/qt6/src/qml/FocusBoxBorder.qml b/qt6/src/qml/FocusBoxBorder.qml
@@ -8,9 +8,9 @@ import org.deepin.dtk.style 1.0 as DS
 
 Item {
     id: control
-    property color color: "transparent"
+    property color color: palette.highlight
     property real borderWidth: DS.Style.control.focusBorderWidth
-    property real radius: 0
+    property real radius: DS.Style.control.radius
 
     Rectangle {
         id: _border

diff --git a/qt6/src/qml/Slider.qml b/qt6/src/qml/Slider.qml
@@ -43,6 +43,12 @@ T.Slider {
         palette: D.DTK.makeIconPalette(control.palette)
         mode: control.D.ColorSelector.controlState
         theme: control.D.ColorSelector.controlTheme
+
+        Loader {
+            anchors.fill: parent
+            active: control.visualFocus
+            sourceComponent: FocusBoxBorder {}
+        }
     }
 
     // draw panel

diff --git a/qt6/src/qml/Switch.qml b/qt6/src/qml/Switch.qml
@@ -114,4 +114,9 @@ T.Switch {
         text: control.text
         verticalAlignment: Text.AlignVCenter
     }
+
+    background: Loader {
+        active: control.visualFocus
+        sourceComponent: FocusBoxBorder {}
+    }
 }