From a471268873f72482fcb7d2b2c3df91222fdd558e Mon Sep 17 00:00:00 2001
From: Penelope Gwen <support@pogmom.me>
Date: Thu, 24 Jul 2025 15:45:02 -0700
Subject: [PATCH] New backup 2025-07-24 15:45:02

---
 .../.config/eww/modules/bar/window_name.yuck  |  4 +--
 .../.config/eww/modules/bar/workspaces.yuck   | 11 ++++----
 de/home/.config/eww/style/bar.scss            | 25 +++++++++++--------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/de/home/.config/eww/modules/bar/window_name.yuck b/de/home/.config/eww/modules/bar/window_name.yuck
index 172868f..9e9fb60 100644
--- a/de/home/.config/eww/modules/bar/window_name.yuck
+++ b/de/home/.config/eww/modules/bar/window_name.yuck
@@ -2,5 +2,5 @@
                               :interval "60s"
   "scripts/bar/activewindow")
 (defwidget windowtitle []
-  (box :class {active_window_name != "" ? "active_window" : ""}
-    {active_window_name}))
+  (label :class {active_window_name != "" ? "active_window" : ""}
+         :text {active_window_name}))
diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck
index de94ec1..787fc09 100644
--- a/de/home/.config/eww/modules/bar/workspaces.yuck
+++ b/de/home/.config/eww/modules/bar/workspaces.yuck
@@ -1,5 +1,4 @@
-(deflisten activeWorkspace :initial '0'
-                           'scripts/bar/active-workspace')
+(deflisten activeWorkspace 'scripts/bar/active-workspace')
 (deflisten workspacesArray :initial '[{"name": "placeholder","focused":true,"num":0}]'
                            'scripts/bar/workspaces')
 (defvar wsreveal true)
@@ -17,8 +16,8 @@
     (box
       (for entry in array
         (literal
-          :visible {(entry.num < activeWorkspace) ? true : false}
-          :content {(entry.num < activeWorkspace) ? "(workspace :ws entry :side 'left')" : "(box :visible false)"}))))
+          :visible {((entry.num <= activeWorkspace) && !entry.focused) ? true : false}
+          :content {((entry.num <= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'left')" : "(box :visible false)"}))))
   (box
     (for entry in array
       (literal
@@ -31,8 +30,8 @@
     (box
       (for entry in array
         (literal
-          :visible {(entry.num > activeWorkspace) ? true : false}
-          :content {(entry.num > activeWorkspace) ? "(workspace :ws entry :side 'right')" : "(box :visible false)"}))))))
+          :visible {((entry.num >= activeWorkspace) && !entry.focused) ? true : false}
+          :content {((entry.num >= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'right')" : "(box :visible false)"}))))))
 
 ;  (for entry in array
 ;    {entry.focused ? (workspace :ws entry) : ""})))
diff --git a/de/home/.config/eww/style/bar.scss b/de/home/.config/eww/style/bar.scss
index 0508d6e..8e0ed0d 100644
--- a/de/home/.config/eww/style/bar.scss
+++ b/de/home/.config/eww/style/bar.scss
@@ -8,15 +8,15 @@
   .rightgroup {
     background-color: $bar-bg-color;
     border-radius: $bar-module-border-radius;
-    &>box:not(.workspaces),
-//    &>box,
+//    &>box:not(.workspaces),
+    &>box.revealer-on-hover,
     &>button,
     &>label {
       color: $bar-module-fg-color;
       background-color: $bar-bg-color;
       border-radius: $bar-module-border-radius;
       margin: 0px 5px;
-      padding: 0px 5px;
+//      padding: 0px 5px;
       min-width: $bar-module-width;
       border: 2px solid $bar-module-fg-color;
       background-color: $bar-module-bg-color;
@@ -26,30 +26,31 @@
   .workspaces {
     color: $bar-module-fg-color;
     border-radius: $bar-module-border-radius;
-//    margin: 0px 5px;
-    min-width: $bar-module-width;
+    margin: 0px 5px;
+//    min-width: $bar-module-width;
     border: 2px solid $bar-module-fg-color;
     background-color: $bar-module-bg-color;
 
     button {
-      padding: 3px 4px;
+      min-width: 35px;
+//      padding: 3px 4px;
       &.left {
-        border-right: 2px solid $bar-module-fg-color;
+        border-right: 1px solid $bar-module-fg-color;
       }
       &.center {
         text-shadow: $bar-module-active-shadow;
         color: $bar-module-active-fg-color;
       }
       &.right {
-        border-left: 2px solid $bar-module-fg-color;
+        border-left: 1px solid $bar-module-fg-color;
       }
       label {
-        padding: 0px 5px;
+        padding: 4px 6px;
         margin-right: -10px;
       }
       .workspace-number {
         margin: 0px;
-        margin-left: 6px;
+        margin-left: 2px;
         margin-top: -15px;
         padding: 0px;
         font-size: 0.6em;
@@ -77,9 +78,11 @@
     color: $color9;
     background-color: $color2;
   }
+  &>box>button,
+  &>box>label,
   .revealer-on-hover>widget>box>box>*,
   .reveal_children>* {
-    padding: 3px 4px;
+    padding: 0px 4px;
     min-width: $bar-module-width;
     transition: all 0.3s;
     &:hover {