1 files changed, 39 insertions, 5 deletions

diff --git a/modules/controlcenter/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml
index 96dc002..8ad4b1f 100644
--- a/modules/controlcenter/bluetooth/BtPane.qml
+++ b/modules/controlcenter/bluetooth/BtPane.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import ".."
+import qs.components.controls
 import qs.components.effects
 import qs.components.containers
 import qs.config
@@ -19,30 +20,57 @@ RowLayout {
     spacing: 0
 
     Item {
+        id: leftBtItem
         Layout.preferredWidth: Math.floor(parent.width * 0.4)
         Layout.minimumWidth: 420
         Layout.fillHeight: true
 
-        DeviceList {
+        ClippingRectangle {
+            id: leftBtClippingRect
             anchors.fill: parent
-            anchors.margins: Appearance.padding.large + Appearance.padding.normal
-            anchors.leftMargin: Appearance.padding.large
-            anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
+            anchors.margins: Appearance.padding.normal
+            anchors.leftMargin: 0
+            anchors.rightMargin: Appearance.padding.normal / 2
+
+            radius: leftBtBorder.innerRadius
+            color: "transparent"
 
-            session: root.session
+            Loader {
+                id: leftBtLoader
+
+                anchors.fill: parent
+                anchors.margins: Appearance.padding.large + Appearance.padding.normal
+                anchors.leftMargin: Appearance.padding.large
+                anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
+
+                asynchronous: true
+                sourceComponent: btDeviceListComponent
+            }
         }
 
         InnerBorder {
+            id: leftBtBorder
             leftThickness: 0
             rightThickness: Appearance.padding.normal / 2
         }
+
+        Component {
+            id: btDeviceListComponent
+
+            DeviceList {
+                anchors.fill: parent
+                session: root.session
+            }
+        }
     }
 
     Item {
+        id: rightBtItem
         Layout.fillWidth: true
         Layout.fillHeight: true
 
         ClippingRectangle {
+            id: btClippingRect
             anchors.fill: parent
             anchors.margins: Appearance.padding.normal
             anchors.leftMargin: 0
@@ -104,14 +132,20 @@ RowLayout {
             id: settings
 
             StyledFlickable {
+                id: settingsFlickable
                 flickableDirection: Flickable.VerticalFlick
                 contentHeight: settingsInner.height
 
+                StyledScrollBar.vertical: StyledScrollBar {
+                    flickable: settingsFlickable
+                }
+
                 Settings {
                     id: settingsInner
 
                     anchors.left: parent.left
                     anchors.right: parent.right
+                    anchors.top: parent.top
                     session: root.session
                 }
             }