From dabb3254363a7ab871cc48779b40a931fa3c0619 Mon Sep 17 00:00:00 2001
From: Janis Hutz <info@janishutz.com>
Date: Sat, 26 Apr 2025 21:14:05 +0200
Subject: [PATCH] [AGS] Fix Bluetooth menu

---
 .../modules/Bluetooth/Bluetooth.tsx           | 66 +++++--------------
 config/rofi/style.rasi                        |  2 +-
 config/wlogout/style.css                      |  2 +-
 3 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/config/astal/components/QuickActions/modules/Bluetooth/Bluetooth.tsx b/config/astal/components/QuickActions/modules/Bluetooth/Bluetooth.tsx
index 74cff75..35b35e6 100644
--- a/config/astal/components/QuickActions/modules/Bluetooth/Bluetooth.tsx
+++ b/config/astal/components/QuickActions/modules/Bluetooth/Bluetooth.tsx
@@ -3,48 +3,21 @@ import { Gtk } from "astal/gtk4";
 import AstalBluetooth from "gi://AstalBluetooth";
 import BTDevice from "./Device";
 const ALIGN = Gtk.Align;
-const MAX_RETRY = 20;
 
 const bt = AstalBluetooth.get_default();
 
-// const LaunchBluetoothModule = () => {
-//     const box = new Gtk.Box();
-//
-//     const placeholder = () => {
-//         return <button cssClasses={["toggle-button"]} child={
-//             <box>
-//                 <label
-//                     cssClasses={['title-2']}
-//                     label={"Bluetooth"}></label>
-//                 <label label={"Backend missing"}></label>
-//             </box>
-//         }>
-//         </button>
-//     }
-//
-//     if (bt.adapter) {
-//         box.append(BluetoothModule());
-//     } else {
-//         const p = placeholder();
-//         box.append(p);
-//
-//         let count = 0;
-//         const i = interval(1000, () => {
-//             if (bt.adapter !== null) {
-//                 box.remove(p);
-//                 box.append(BluetoothModule());
-//                 i.cancel();
-//             } else if (count >= MAX_RETRY) {
-//                 i.cancel();
-//             }
-//             count++;
-//         });
-//     }
-//
-//     return box;
-// }
-
 const BluetoothModule = () => {
+    const picker = BluetoothPicker();
+
+    const openBTPicker = () => {
+        try {
+            bt.adapter.start_discovery();
+        } catch (e) {
+            printerr(e);
+        }
+        picker.popup();
+    };
+
     return (
         <box>
             <button
@@ -106,13 +79,6 @@ const BluetoothModule = () => {
     );
 };
 
-const openBTPicker = () => {
-    picker.popup();
-    try {
-        bt.adapter.start_discovery();
-    } catch (_) { }
-};
-
 const BluetoothPickerList = () => {
     let btEnableState = false;
 
@@ -240,13 +206,17 @@ const BluetoothPicker = () => {
     const popover = new Gtk.Popover();
 
     popover.set_child(BluetoothPickerList());
-    popover.connect("closed", () => bt.adapter.stop_discovery());
+    popover.connect("closed", () => {
+        try {
+            bt.adapter.stop_discovery();
+        } catch (e) {
+            printerr(e);
+        }
+    });
 
     return popover;
 };
 
-const picker = BluetoothPicker();
-
 export default {
     BluetoothModule,
 };
diff --git a/config/rofi/style.rasi b/config/rofi/style.rasi
index 554ec37..b4376c3 100644
--- a/config/rofi/style.rasi
+++ b/config/rofi/style.rasi
@@ -14,7 +14,7 @@
 
 #window {
     background-color: @background;
-    border-color: @accent-two;
+    border-color: @accent;
     border: 1px;
     border-radius: 10px;
     padding: 0;
diff --git a/config/wlogout/style.css b/config/wlogout/style.css
index d18ac5b..fc6beda 100644
--- a/config/wlogout/style.css
+++ b/config/wlogout/style.css
@@ -26,7 +26,7 @@ button:hover {
 }
 
 button:focus {
-    background-color: rgb(89, 22, 65);
+    background-color: rgb(151, 16, 58);
     color: rgb(230, 230, 230);
 }