internal: use templates

8 files changed, 16 insertions, 15 deletions

diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml
index 4bf721a..78b8a5c 100644
--- a/components/controls/FilledSlider.qml
+++ b/components/controls/FilledSlider.qml
@@ -3,7 +3,7 @@ import "../effects"
 import qs.services
 import qs.config
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Templates
 
 Slider {
     id: root
diff --git a/components/controls/StyledRadioButton.qml b/components/controls/StyledRadioButton.qml
index 781ff7f..b72fc77 100644
--- a/components/controls/StyledRadioButton.qml
+++ b/components/controls/StyledRadioButton.qml
@@ -2,13 +2,16 @@ import qs.components
 import qs.services
 import qs.config
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Templates
 
 RadioButton {
     id: root
 
     font.pointSize: Appearance.font.size.smaller
 
+    implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
+    implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
+
     indicator: Rectangle {
         id: outerCircle
 
diff --git a/components/controls/StyledSlider.qml b/components/controls/StyledSlider.qml
index 0670e1c..92c8aa8 100644
--- a/components/controls/StyledSlider.qml
+++ b/components/controls/StyledSlider.qml
@@ -2,7 +2,7 @@ import qs.components
 import qs.services
 import qs.config
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Templates
 
 Slider {
     id: root
diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml
index ecc1076..ce93cd5 100644
--- a/components/controls/StyledSwitch.qml
+++ b/components/controls/StyledSwitch.qml
@@ -2,7 +2,7 @@ import ".."
 import qs.services
 import qs.config
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Templates
 import QtQuick.Shapes
 
 Switch {
diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml
index fcc2a1e..952dd6b 100644
--- a/modules/bar/popouts/Audio.qml
+++ b/modules/bar/popouts/Audio.qml
@@ -31,10 +31,9 @@ Item {
 
         anchors.left: parent.left
         anchors.verticalCenter: parent.verticalCenter
-        spacing: 0
+        spacing: Appearance.spacing.normal
 
         StyledText {
-            Layout.bottomMargin: Appearance.spacing.small / 2
             text: qsTr("Output device")
             font.weight: 500
         }
@@ -55,8 +54,7 @@ Item {
         }
 
         StyledText {
-            Layout.topMargin: Appearance.spacing.normal
-            Layout.bottomMargin: Appearance.spacing.small / 2
+            Layout.topMargin: Appearance.spacing.smaller
             text: qsTr("Input device")
             font.weight: 500
         }
@@ -75,8 +73,8 @@ Item {
         }
 
         StyledText {
-            Layout.topMargin: Appearance.spacing.normal
-            Layout.bottomMargin: Appearance.spacing.small / 2
+            Layout.topMargin: Appearance.spacing.smaller
+            Layout.bottomMargin: -Appearance.spacing.small / 2
             text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
             font.weight: 500
         }
diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index dc9f4cc..92f86d5 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -14,7 +14,7 @@ import QtQuick.Controls
 StyledListView {
     id: root
 
-    required property TextField search
+    required property StyledTextField search
     required property PersistentProperties visibilities
 
     model: ScriptModel {
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 123acdc..a6ccf53 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -1,12 +1,12 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import qs.utils
 import Quickshell
 import QtQuick
-import QtQuick.Controls
 
 Item {
     id: root
@@ -14,7 +14,7 @@ Item {
     required property var content
     required property PersistentProperties visibilities
     required property var panels
-    required property TextField search
+    required property StyledTextField search
     required property int padding
     required property int rounding
 
diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml
index 75916df..d5a747a 100644
--- a/modules/launcher/WallpaperList.qml
+++ b/modules/launcher/WallpaperList.qml
@@ -1,16 +1,16 @@
 pragma ComponentBehavior: Bound
 
 import "items"
+import qs.components.controls
 import qs.services
 import qs.config
 import Quickshell
 import QtQuick
-import QtQuick.Controls
 
 PathView {
     id: root
 
-    required property TextField search
+    required property StyledTextField search
     required property PersistentProperties visibilities
     required property var panels
     required property var content