oxwm

https://git.tonybtw.com/oxwm.git git://git.tonybtw.com/oxwm.git

Updated bar

Commit
08512bf2dfee4a4f12002346177155f2672201db
Parent
42f82ad
Author
tonybanters <tonybanters@gmail.com>
Date
2025-10-03 17:44:06

Diff

diff --git a/src/bar/bar.rs b/src/bar/bar.rs
index f367c44..dcf3369 100644
--- a/src/bar/bar.rs
+++ b/src/bar/bar.rs
@@ -104,7 +104,6 @@ impl Bar {
         if !self.needs_redraw {
             return Ok(());
         }
-
         connection.change_gc(
             self.graphics_context,
             &ChangeGCAux::new().foreground(SCHEME_NORMAL.background),
@@ -152,7 +151,14 @@ impl Bar {
                         height: self.height,
                     }],
                 )?;
-            } else if is_occupied {
+            }
+
+            let text_y = (self.height as i16 / 2) + (self.font.ascent() / 2);
+            self.font_draw
+                .draw_text(&self.font, scheme.foreground, x_position + 5, text_y, tag);
+
+            if is_selected {
+                let underline_height = 2;
                 connection.change_gc(
                     self.graphics_context,
                     &ChangeGCAux::new().foreground(scheme.border),
@@ -162,17 +168,13 @@ impl Bar {
                     self.graphics_context,
                     &[Rectangle {
                         x: x_position,
-                        y: 0,
+                        y: (self.height - underline_height) as i16,
                         width: tag_width,
-                        height: 2,
+                        height: underline_height,
                     }],
                 )?;
             }
 
-            let text_y = (self.height as i16 / 2) + (self.font.ascent() / 2);
-            self.font_draw
-                .draw_text(&self.font, scheme.foreground, x_position + 5, text_y, tag);
-
             x_position += tag_width as i16;
         }
 
diff --git a/src/config.rs b/src/config.rs
index 0bb91c0..e21091a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -49,7 +49,7 @@ pub const SCHEME_SELECTED: ColorScheme = ColorScheme {
 pub const SCHEME_OCCUPIED: ColorScheme = ColorScheme {
     foreground: GRAY_LIGHTEST,
     background: GRAY_DARK,
-    border: GRAY_MID,
+    border: CYAN,
 };
 
 // ========================================