From 0ac782cd8e26e99cbe66af678bb74ef732a256da Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 10 Sep 2023 15:49:37 -0400
Subject: [PATCH] fix(ags): adjust to new service getters

---
 config/ags/config.js                     | 4 ++--
 config/ags/js/bar/workspaces.js          | 5 ++---
 config/ags/scss/widgets/traybuttons.scss | 2 +-
 config/ags/style.css                     | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/ags/config.js b/config/ags/config.js
index d64a63e..5617ae1 100644
--- a/config/ags/config.js
+++ b/config/ags/config.js
@@ -1,7 +1,7 @@
 import { exec } from 'resource:///com/github/Aylur/ags/utils.js';
 import { Powermenu } from './js/powermenu.js';
 import { Bar } from './js/bar/bar.js';
-import { DragTest } from './js/test/drag.js';
+//import { DragTest } from './js/test/drag.js';
 import { Closer } from './js/common.js';
 
 const scss = ags.App.configDir + '/scss/main.scss';
@@ -18,6 +18,6 @@ export default {
       Powermenu,
       Bar,
       Closer,
-      DragTest,
+      //DragTest,
     ]
 }
diff --git a/config/ags/js/bar/workspaces.js b/config/ags/js/bar/workspaces.js
index 62e1909..9bd0c8b 100644
--- a/config/ags/js/bar/workspaces.js
+++ b/config/ags/js/bar/workspaces.js
@@ -14,9 +14,8 @@ Revealer({
       child: Label(`${i}`),
       connections: [
         [Hyprland, btn => {
-          const { workspaces, active } = Hyprland;
-          const occupied = workspaces.has(i) && workspaces.get(i).windows > 0;
-          btn.toggleClassName('active', active.workspace.id === i);
+          const occupied = Hyprland.getWorkspace(i)?.windows > 0;
+          btn.toggleClassName('active', Hyprland.active.workspace.id === i);
           btn.toggleClassName('occupied', occupied);
           btn.toggleClassName('empty', !occupied);
         }]
diff --git a/config/ags/scss/widgets/traybuttons.scss b/config/ags/scss/widgets/traybuttons.scss
index 958e250..a4e3835 100644
--- a/config/ags/scss/widgets/traybuttons.scss
+++ b/config/ags/scss/widgets/traybuttons.scss
@@ -96,7 +96,7 @@
       margin-top: -30px;
       border-radius: 80px;
       min-height: 37px;
-      background: rgba(#8466ae, 0.8);
+      background: rgba(#5e497c, 0.8);
     }
   }
 }
diff --git a/config/ags/style.css b/config/ags/style.css
index a55a601..c35d729 100644
--- a/config/ags/style.css
+++ b/config/ags/style.css
@@ -110,7 +110,7 @@
     margin-top: -30px;
     border-radius: 80px;
     min-height: 37px;
-    background: rgba(132, 102, 174, 0.8); }
+    background: rgba(94, 73, 124, 0.8); }
 
 tooltip {
   background: rgba(0, 0, 0, 0.6);