From a7e6584f7805b6071e4de979e37a8f0fc8065448 Mon Sep 17 00:00:00 2001
From: Janis Hutz <info@janishutz.com>
Date: Sat, 26 Apr 2025 13:07:55 +0200
Subject: [PATCH] [AGS] Improve brightness controls

---
 .../QuickActions/modules/Battery.tsx          | 43 +++++++++----------
 config/astal/components/bar/bar.scss          |  4 ++
 config/astal/util/brightness.ts               |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/config/astal/components/QuickActions/modules/Battery.tsx b/config/astal/components/QuickActions/modules/Battery.tsx
index 82af811..07ec15d 100644
--- a/config/astal/components/QuickActions/modules/Battery.tsx
+++ b/config/astal/components/QuickActions/modules/Battery.tsx
@@ -11,28 +11,27 @@ export const BatteryBox = () => {
         <box
             cssClasses={["battery-info"]}
             visible={bind(battery, "isBattery")}
-        >
-            <box cssClasses={["battery-box"]}>
-                <image
-                    iconName={bind(battery, "batteryIconName")}
-                    tooltipText={bind(battery, "energyRate").as(er =>
-                        batteryEnergy(er),
-                    )}
-                />
-                <label
-                    label={bind(battery, "percentage").as(
-                        p => ` ${Math.round(p * 100)}%`,
-                    )}
-                />
-                <label
-                    cssClasses={["time"]}
-                    hexpand={true}
-                    halign={Gtk.Align.END}
-                    visible={bind(battery, "charging").as(c => !c)}
-                    label={bind(battery, "timeToEmpty").as(t => toTime(t))}
-                />
-            </box>
-        </box>
+            child={
+                <box cssClasses={["battery-box"]}>
+                    <image
+                        iconName={bind(battery, "batteryIconName")}
+                        tooltipText={bind(battery, "energyRate").as(er =>
+                            batteryEnergy(er),
+                        )}
+                    />
+                    <label
+                        label={bind(battery, "percentage").as(
+                            p => ` ${Math.round(p * 100)}%`,
+                        )}
+                    />
+                    <label
+                        cssClasses={["time"]}
+                        visible={bind(battery, "charging").as(c => !c)}
+                        label={bind(battery, "timeToEmpty").as(t => `(${toTime(t)})`)}
+                    />
+                </box>
+            }
+        ></box>
     );
 };
 
diff --git a/config/astal/components/bar/bar.scss b/config/astal/components/bar/bar.scss
index 156653d..0e84599 100644
--- a/config/astal/components/bar/bar.scss
+++ b/config/astal/components/bar/bar.scss
@@ -59,4 +59,8 @@ window.Bar {
       padding: 0;
     }
   }
+  
+  .quick-view-symbol {
+    margin: 3px;
+  }
 }
diff --git a/config/astal/util/brightness.ts b/config/astal/util/brightness.ts
index d3e2706..cf3db5d 100644
--- a/config/astal/util/brightness.ts
+++ b/config/astal/util/brightness.ts
@@ -20,7 +20,7 @@ export default class Brightness extends GObject.Object {
     #kbd = get(`--device ${kbd} get`)
     #screenMax = get("max")
     #screen = get("get") / (get("max") || 1)
-    #screenAvailable = false
+    #screenAvailable = true
 
     @property(Boolean)
     get screenAvailable() { return this.#screenAvailable }