`6376e35`

Fix header/tab overlap by removing redundant border and gap

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

SHA: 6376e355f84f3c8d49463548f741e541e294f8b4
Parents: 9d4452b
Tree: c8f542f

2 changed files

Status	File	+	-
M	`gartop/src/gui/app.rs`	4	7
M	`gartop/src/gui/header.rs`	0	10

gartop/src/gui/app.rsmodified

          // Create components
          let header = HeaderBar::new(Rect::new(0, 0, width, HEADER_HEIGHT));
 -        let tab_bar_y = HEADER_HEIGHT + 4; // Small gap below header
 -        let tab_bar = TabBar::new(Rect::new(0, tab_bar_y as i32, width, TAB_BAR_HEIGHT));
 +        let tab_bar = TabBar::new(Rect::new(0, HEADER_HEIGHT as i32, width, TAB_BAR_HEIGHT));
          let process_list = Self::create_process_list(width, height);
          // Check if daemon is available
      /// Create process list with correct bounds.
      fn create_process_list(width: u32, height: u32) -> ProcessList {
 -        // Account for: header + gap + tab bar + section gap + graph label + graph + section gap
 -        let tab_bar_y = HEADER_HEIGHT + 4;
 -        let content_start = tab_bar_y + TAB_BAR_HEIGHT + SECTION_GAP + 20 + GRAPH_HEIGHT + SECTION_GAP;
 +        // Account for: header + tab bar + section gap + graph label + graph + section gap
 +        let content_start = HEADER_HEIGHT + TAB_BAR_HEIGHT + SECTION_GAP + 20 + GRAPH_HEIGHT + SECTION_GAP;
          let list_height = height.saturating_sub(content_start);
          let list_width = width.saturating_sub(CONTENT_PADDING * 2);
          ProcessList::new(Rect::new(CONTENT_PADDING as i32, content_start as i32, list_width, list_height))
          // Update component bounds
          self.header = HeaderBar::new(Rect::new(0, 0, width, HEADER_HEIGHT));
 -        let tab_bar_y = HEADER_HEIGHT + 4;
 -        self.tab_bar.set_bounds(Rect::new(0, tab_bar_y as i32, width, TAB_BAR_HEIGHT));
 +        self.tab_bar.set_bounds(Rect::new(0, HEADER_HEIGHT as i32, width, TAB_BAR_HEIGHT));
          self.process_list = Self::create_process_list(width, height);
          self.process_list.set_processes(self.processes.clone());

gartop/src/gui/header.rsmodified

          renderer.text(&mem_text, mem_x, y, &mem_style)?;
          renderer.text(&uptime_text, uptime_x, y, &stats_style)?;
 -        // Bottom border
 -        renderer.line(
 -            self.bounds.x as f64,
 -            (self.bounds.y + self.bounds.height as i32) as f64,
 -            right_edge,
 -            (self.bounds.y + self.bounds.height as i32) as f64,
 -            theme.border,
 -            1.0,
 -        )?;
+-
          Ok(())
+     }