From cb7c1dc23c789faf756348183f4dcf9cde74b57b Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Thu, 16 May 2024 09:56:50 +0200
Subject: [PATCH] eww: Fix workspaces monitor filter

---
 tree/.config/eww/eww.scss      |  2 +-
 tree/.config/eww/eww.yuck      | 28 ++++++++++++++--------------
 tree/.local/bin/eww-workspaces |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tree/.config/eww/eww.scss b/tree/.config/eww/eww.scss
index 574bf8f..7790316 100644
--- a/tree/.config/eww/eww.scss
+++ b/tree/.config/eww/eww.scss
@@ -26,7 +26,7 @@ window {
 .workspace {
 	font-size: 18px;
 	font-weight: 400;
-	border: dashed $highlight1 1px;
+	border: dashed $highlight1 2px;
 	background: $lowlight1;
 	border-radius: 30px;
 	padding-top: 3px;
diff --git a/tree/.config/eww/eww.yuck b/tree/.config/eww/eww.yuck
index d38aade..f448ec6 100644
--- a/tree/.config/eww/eww.yuck
+++ b/tree/.config/eww/eww.yuck
@@ -51,23 +51,23 @@
 	     :class "workspaces"
 	     :space-evenly: false
 		; can't use a for loop here because that breaks css animations
-		(workspace :n 1)
-		(workspace :n 2)
-		(workspace :n 3)
-		(workspace :n 4)
-		(workspace :n 5)
-		(workspace :n 6)
-		(workspace :n 7)
-		(workspace :n 8)
-		(workspace :n 9)
-		(workspace :n 10)
-		(workspace :n 11)
-		(workspace :n 12)
+		(workspace :monitor monitor :n 1)
+		(workspace :monitor monitor :n 2)
+		(workspace :monitor monitor :n 3)
+		(workspace :monitor monitor :n 4)
+		(workspace :monitor monitor :n 5)
+		(workspace :monitor monitor :n 6)
+		(workspace :monitor monitor :n 7)
+		(workspace :monitor monitor :n 8)
+		(workspace :monitor monitor :n 9)
+		(workspace :monitor monitor :n 10)
+		(workspace :monitor monitor :n 11)
+		(workspace :monitor monitor :n 12)
 ))
 
-(defwidget workspace [n]
+(defwidget workspace [monitor n]
 	(button :visible {jq(workspaces, '.["${n}"] != null')}
-	        :class 'workspace ${workspaces[n].class}'
+	        :class 'workspace ${workspaces[n].active && monitor == workspaces[n].monitor ? "active" : ""}'
 		(label :text n))
 )
 
diff --git a/tree/.local/bin/eww-workspaces b/tree/.local/bin/eww-workspaces
index 0d25122..5549307 100755
--- a/tree/.local/bin/eww-workspaces
+++ b/tree/.local/bin/eww-workspaces
@@ -5,6 +5,6 @@ let active = (hyprctl activeworkspace -j | from json | get id)
 hyprctl workspaces -j | 
     from json |
 	sort-by id |
-    each {|w| {$w.id: {monitor: $w.monitorID class: (if ($w.id == $active) {"active"} else {""}) }}} |
+    each {|w| {$w.id: {monitor: $w.monitorID active: ($w.id == $active) }}} |
 	reduce {|a, b| $a | merge $b } |
 	to json