oxwm

Diff

diff --git a/src/bar/bar.rs b/src/bar/bar.rs
index dcf3369..0204ee5 100644
--- a/src/bar/bar.rs
+++ b/src/bar/bar.rs
@@ -1,5 +1,5 @@
 use super::font::{Font, FontDraw};
-use crate::config::{BAR_HEIGHT, FONT, SCHEME_NORMAL, SCHEME_OCCUPIED, SCHEME_SELECTED, TAGS};
+use crate::config::{BAR_HEIGHT, FONT, SCHEME_NORMAL, SCHEME_SELECTED, TAGS};
 use anyhow::Result;
 use x11rb::COPY_DEPTH_FROM_PARENT;
 use x11rb::connection::Connection;
@@ -104,6 +104,7 @@ impl Bar {
         if !self.needs_redraw {
             return Ok(());
         }
+
         connection.change_gc(
             self.graphics_context,
             &ChangeGCAux::new().foreground(SCHEME_NORMAL.background),
@@ -128,31 +129,12 @@ impl Bar {
 
             let tag_width = self.tag_widths[tag_index];
 
-            let scheme = if is_selected {
+            let scheme = if is_selected || is_occupied {
                 &SCHEME_SELECTED
-            } else if is_occupied {
-                &SCHEME_OCCUPIED
             } else {
                 &SCHEME_NORMAL
             };
 
-            if is_selected {
-                connection.change_gc(
-                    self.graphics_context,
-                    &ChangeGCAux::new().foreground(scheme.background),
-                )?;
-                connection.poly_fill_rectangle(
-                    self.window,
-                    self.graphics_context,
-                    &[Rectangle {
-                        x: x_position,
-                        y: 0,
-                        width: tag_width,
-                        height: self.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);
@@ -174,7 +156,6 @@ impl Bar {
                     }],
                 )?;
             }
-
             x_position += tag_width as i16;
         }
 
diff --git a/src/config.rs b/src/config.rs
index e21091a..15781a7 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -8,7 +8,7 @@ use x11rb::protocol::xproto::KeyButMask;
 pub const BORDER_WIDTH: u32 = 1;
 pub const BORDER_FOCUSED: u32 = 0x6dade3;
 pub const BORDER_UNFOCUSED: u32 = 0xbbbbbb;
-pub const BAR_HEIGHT: u16 = 30;
+pub const BAR_HEIGHT: u16 = 32;
 pub const FONT: &str = "JetBrainsMono Nerd Font:size=16";
 
 // ========================================
@@ -25,7 +25,7 @@ pub const MODKEY: KeyButMask = KeyButMask::MOD1;
 const GRAY_DARK: u32 = 0x222222;
 const GRAY_MID: u32 = 0x444444;
 const GRAY_LIGHT: u32 = 0xbbbbbb;
-const GRAY_LIGHTEST: u32 = 0xeeeeee;
+// const GRAY_LIGHTEST: u32 = 0xeeeeee;
 const CYAN: u32 = 0x6dade3;
 
 pub struct ColorScheme {
@@ -40,14 +40,14 @@ pub const SCHEME_NORMAL: ColorScheme = ColorScheme {
     border: GRAY_MID,
 };
 
-pub const SCHEME_SELECTED: ColorScheme = ColorScheme {
-    foreground: GRAY_LIGHTEST,
-    background: CYAN,
-    border: CYAN,
-};
+// pub const SCHEME_OCCUPIED: ColorScheme = ColorScheme {
+//     foreground: CYAN,
+//     background: GRAY_DARK,
+//     border: CYAN,
+// };
 
-pub const SCHEME_OCCUPIED: ColorScheme = ColorScheme {
-    foreground: GRAY_LIGHTEST,
+pub const SCHEME_SELECTED: ColorScheme = ColorScheme {
+    foreground: CYAN,
     background: GRAY_DARK,
     border: CYAN,
 };