🔧 chore(widget/bar/workspaces): add new feature to hide if there's only a single workspace available

src/widget/bar/Media.tsx

@@ -20,68 +20,45 @@ export const Media = () => {
         : obj.disconnect(id)
     ));
 
-    return <Gtk.Box class={"media"} visible={player((pl) => pl.available)}
+    return <Gtk.Box class={"media"} visible={player((pl) => pl.available)}>
-      $={(self) => {
+        <Gtk.EventControllerScroll $={(self) => {
-          const gestureClick = Gtk.GestureClick.new(),
+              self.set_flags(Gtk.EventControllerScrollFlags.VERTICAL)
-              controllerMotion = Gtk.EventControllerMotion.new(),
+          }} onScroll={(_, __, dy) => {
-              controllerScroll = Gtk.EventControllerScroll.new(
+              if(AstalMpris.get_default().players.length === 1 && 
-                  Gtk.EventControllerScrollFlags.VERTICAL
+                player.get()?.busName === AstalMpris.get_default().players[0].busName) 
-              );
+                  return true;
 
-          self.add_controller(gestureClick);
+              const players = AstalMpris.get_default().players;
-          self.add_controller(controllerMotion);
-          self.add_controller(controllerScroll);
 
-          connections.set(gestureClick, gestureClick.connect("released", () =>
+              for(let i = 0; i < players.length; i++) {
-              Windows.getDefault().toggle("center-window")));
+                  const pl = players[i];
 
-          connections.set(controllerScroll, 
+                  if(pl.busName !== player.get().busName) 
-              controllerScroll.connect("scroll", (_, _dx, dy) => {
+                      continue;
-                  if(AstalMpris.get_default().players.length === 1 && 
-                     player.get()?.busName === AstalMpris.get_default().players[0].busName) 
-                      return true;
 
-                  const players = AstalMpris.get_default().players;
+                  if(dy > 0 && players[i-1]) {
-
+                      setPlayer(players[i-1]);
-                  for(let i = 0; i < players.length; i++) {
+                      break;
-                      const pl = players[i];
-
-                      if(pl.busName !== player.get().busName) 
-                          continue;
-
-                      if(dy > 0 && players[i-1]) {
-                          setPlayer(players[i-1]);
-                          break;
-                      }
-
-                      if(dy < 0 && players[i+1]) {
-                          setPlayer(players[i+1]);
-                          break;
-                      }
                   }
 
-                  return true;
+                  if(dy < 0 && players[i+1]) {
-              })
+                      setPlayer(players[i+1]);
-          );
+                      break;
-
+                  }
-          connections.set(controllerMotion, [
+              }
-              controllerMotion.connect("enter", () => {
-                  const revealer = self.get_last_child() as Gtk.Revealer;
-                  revealer.set_reveal_child(true);
-              }),
-              controllerMotion.connect("leave", () => {
-                  const revealer = self.get_last_child() as Gtk.Revealer;
-                  revealer.set_reveal_child(false);
-              })
-          ]);
-
-          connections.set(self, self.connect("destroy", () => 
-              connections.forEach((ids, obj) => Array.isArray(ids) ?
-                  ids.forEach(id => obj.disconnect(id))
-              : obj.disconnect(ids))
-          ));
-      }}>
 
+              return true;
+          }}
+        />
+        <Gtk.GestureClick onReleased={() => Windows.getDefault().toggle("center-window")} />
+        <Gtk.EventControllerMotion onEnter={(self) => {
+              const revealer = self.get_widget()!.get_last_child() as Gtk.Revealer;
+              revealer.set_reveal_child(true);
+          }} onLeave={(self) => {
+              const revealer = self.get_widget()!.get_last_child() as Gtk.Revealer;
+              revealer.set_reveal_child(false);
+          }}
+        />
         <Gtk.Box spacing={4} visible={player(pl => pl.available)}>
             <With value={player(pl => pl.available)}>
                 {(available: boolean) => available && <Gtk.Box>

src/widget/bar/Workspaces.tsx

@@ -1,12 +1,11 @@
 import { Gtk } from "ags/gtk4";
-import AstalHyprland from "gi://AstalHyprland";
 import { getAppIcon, getSymbolicIcon } from "../../modules/apps";
 import { Separator } from "../Separator";
 import { generalConfig } from "../../app";
 import { createBinding, createComputed, createState, For, With } from "ags";
 import { variableToBoolean } from "../../modules/utils";
 
-import GObject from "ags/gobject";
+import AstalHyprland from "gi://AstalHyprland";
 
 
 const [showNumbers, setShowNumbers] = createState(false);
@@ -19,10 +18,15 @@ export const Workspaces = () => {
         defaultWorkspaces = workspaces.as(wss => 
             wss.filter(ws => ws.id > 0).sort((a, b) => a.id - b.id)),
         specialWorkspaces = workspaces.as(wss => 
-            wss.filter(ws => ws.id < 0).sort((a, b) => a.id - b.id));
+            wss.filter(ws => ws.id < 0).sort((a, b) => a.id - b.id)),
+        focusedWorkspace = createBinding(AstalHyprland.get_default(), "focusedWorkspace");
 
 
-    return <Gtk.Box class={"workspaces-row"}>
+    return <Gtk.Box class={"workspaces-row"} visible={createComputed([
+          workspaces.as(wss => wss.length <= 1),
+          generalConfig.bindProperty("workspaces.hide_if_single", "boolean")
+      ], (hideable, enabled) => enabled && hideable ? false : true
+    )}>
         <Gtk.Box class={"special-workspaces"} spacing={4}>
             <For each={specialWorkspaces}>
                 {(ws: AstalHyprland.Workspace) => 
@@ -54,34 +58,19 @@ export const Workspaces = () => {
               margin={12} spacing={8} visible={variableToBoolean(specialWorkspaces)}
             />
         </Gtk.Revealer>
-        <Gtk.Box class={"default-workspaces"} spacing={4} $={(self) => {
+        <Gtk.Box class={"default-workspaces"} spacing={4}>
-              const conns: Map<GObject.Object, Array<number>|number> = new Map();
+            <Gtk.EventControllerScroll $={(self) => self.set_flags(Gtk.EventControllerScrollFlags.VERTICAL)}
-              const controllerScroll = Gtk.EventControllerScroll.new(
+              onScroll={(_, __, dy) => {
-                  Gtk.EventControllerScrollFlags.VERTICAL
-              ), controllerMotion = Gtk.EventControllerMotion.new();
-
-              self.add_controller(controllerScroll);
-              self.add_controller(controllerMotion);
-
-              conns.set(controllerScroll, controllerScroll.connect("scroll", (_, _dx, dy) => {
                   dy > 0 ?
                       AstalHyprland.get_default().dispatch("workspace", "e-1")
                   : AstalHyprland.get_default().dispatch("workspace", "e+1");
 
                   return true;
-              }));
+              }}
-
+            />
-              conns.set(controllerMotion, [
+            <Gtk.EventControllerMotion onEnter={() => setShowNumbers(true)}
-                  controllerMotion.connect("enter", () => setShowNumbers(true)),
+              onLeave={() => setShowNumbers(false)}
-                  controllerMotion.connect("leave", () => setShowNumbers(false))
+            />
-              ]);
-
-              conns.set(self, self.connect("destroy", () => conns.forEach((ids, obj) =>
-                  Array.isArray(ids) ? 
-                      ids.forEach(id => obj.disconnect(id))
-                  : obj.disconnect(ids)
-              )));
-          }}>
             <For each={defaultWorkspaces}>
                 {(ws: AstalHyprland.Workspace, i) => {
                     const showId = createComputed([
@@ -122,20 +111,20 @@ export const Workspaces = () => {
                                   `${lastClient.get_class()}: `
                               : ""
                           } ${lastClient.title}` : "" }`
-                      )} onClicked={() => ws.focus()}>
+                      )} onClicked={() => focusedWorkspace.get()?.id !== ws.id && ws.focus()}>
-                        
                         
                         <With value={createBinding(ws, "lastClient")}>
                             {(lastClient: AstalHyprland.Client) => 
                                 <Gtk.Box class={"last-client"} hexpand>
                                     <Gtk.Revealer transitionDuration={280} revealChild={showId}
-                                      transitionType={createBinding(AstalHyprland.get_default(), "focusedWorkspace")
+                                      transitionType={focusedWorkspace.as(
-                                          .as(fws => fws.id !== ws.id ? 
+                                          fws => fws.id !== ws.id ? 
-                                               Gtk.RevealerTransitionType.SLIDE_LEFT
+                                              Gtk.RevealerTransitionType.SLIDE_LEFT
-                                             : Gtk.RevealerTransitionType.SLIDE_RIGHT)}>
+                                          : Gtk.RevealerTransitionType.SLIDE_RIGHT
-
+                                      )}>
                                         <Gtk.Label label={createBinding(ws, "id").as(String)}
-                                          class={"id"} hexpand />
+                                          class={"id"} hexpand 
+                                        />
                                     </Gtk.Revealer>
                                     {lastClient && <Gtk.Image class={"last-client-icon"} iconName={
                                       createBinding(lastClient, "initialClass").as(initialClass =>