`d6be65e`

Increase header height and fix tab bar layout

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: d6be65e760cf30b9374e16774fd8c6253de23cd6
Parents: 6376e35
Tree: 31859e4

2 changed files

Status	File	+	-
M	`gartop/src/gui/app.rs`	1	1
M	`gartop/src/gui/tabs.rs`	2	12

gartop/src/gui/app.rsmodified


 use x11rb::protocol::xproto::{ConnectionExt, ImageFormat};
 
 /// Header bar height.
+const HEADER_HEIGHT: u32 = 48;
 
 /// Graph height.
 const GRAPH_HEIGHT: u32 = 150;

gartop/src/gui/tabs.rsmodified

      fn calculate_tab_bounds(bounds: Rect) -> Vec<Rect> {
          let tabs = Tab::all();
          let tab_width = 100u32;
--        let tab_height = bounds.height - 4;
++        let tab_height = bounds.height - 8; // Leave room for padding
          let mut result = Vec::with_capacity(tabs.len());
          for (i, _) in tabs.iter().enumerate() {
              let x = bounds.x + 8 + (i as i32 * (tab_width as i32 + 4));
--            let y = bounds.y + 2;
++            let y = bounds.y + 4; // More top padding
              result.push(Rect::new(x, y, tab_width, tab_height));
+         }
          // Background
          renderer.fill_rect(self.bounds, theme.panel_bg)?;
--        // Bottom border
--        renderer.line(
--            self.bounds.x as f64,
--            (self.bounds.y + self.bounds.height as i32) as f64,
--            (self.bounds.x + self.bounds.width as i32) as f64,
--            (self.bounds.y + self.bounds.height as i32) as f64,
--            theme.border,
--            1.0,
--        )?;
--
          let tabs = Tab::all();
          for (i, tab_rect) in self.tab_bounds.iter().enumerate() {
              let tab = tabs[i];

`@@ -18,7 +18,7 @@` use std::time::Instant;
18	use x11rb::protocol::xproto::{ConnectionExt, ImageFormat};	18	use x11rb::protocol::xproto::{ConnectionExt, ImageFormat};
19		19
20	/// Header bar height.	20	/// Header bar height.
21	-const HEADER_HEIGHT: u32 = 40;	21	+const HEADER_HEIGHT: u32 = 48;
22		22
23	/// Graph height.	23	/// Graph height.
24	const GRAPH_HEIGHT: u32 = 150;	24	const GRAPH_HEIGHT: u32 = 150;