From 04bfc87f65d6e13b287358e1024d9bbc055b0c58 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 3 Jan 2026 18:58:40 +1100
Subject: bluetooth: make device sort order stable

Closes #948
---
 modules/bar/popouts/Bluetooth.qml              | 2 +-
 modules/controlcenter/bluetooth/DeviceList.qml | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml
index 4674905..91ac560 100644
--- a/modules/bar/popouts/Bluetooth.qml
+++ b/modules/bar/popouts/Bluetooth.qml
@@ -62,7 +62,7 @@ ColumnLayout {
 
     Repeater {
         model: ScriptModel {
-            values: [...Bluetooth.devices.values].sort((a, b) => (b.connected - a.connected) || (b.paired - a.paired)).slice(0, 5)
+            values: [...Bluetooth.devices.values].sort((a, b) => (b.connected - a.connected) || (b.paired - a.paired) || a.name.localeCompare(b.name)).slice(0, 5)
         }
 
         RowLayout {
diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml
index b978a2d..2a2bde9 100644
--- a/modules/controlcenter/bluetooth/DeviceList.qml
+++ b/modules/controlcenter/bluetooth/DeviceList.qml
@@ -27,7 +27,7 @@ DeviceList {
     model: ScriptModel {
         id: deviceModel
 
-        values: [...Bluetooth.devices.values].sort((a, b) => (b.connected - a.connected) || (b.paired - a.paired))
+        values: [...Bluetooth.devices.values].sort((a, b) => (b.connected - a.connected) || (b.paired - a.paired) || a.name.localeCompare(b.name))
     }
 
     headerComponent: Component {
@@ -128,7 +128,6 @@ DeviceList {
         }
     }
 
-
     delegate: Component {
         StyledRect {
             id: device
@@ -261,7 +260,5 @@ DeviceList {
         }
     }
 
-    onItemSelected: function(item) {
-        session.bt.active = item;
-    }
+    onItemSelected: item => session.bt.active = item
 }
-- 
cgit v1.2.3-freya