This commit is contained in:
alice pellerin
2026-03-19 03:07:05 -05:00
parent cb2eeee932
commit 0f11fb9273
2 changed files with 34 additions and 7 deletions
+32 -3
View File
@@ -1,8 +1,37 @@
use ratatui::{layout::Rect, widgets::Widget}; use ratatui::{layout::Rect, style::{Color, Stylize}, text::{Line, Span}, widgets::Widget};
use crate::app::App; use crate::{app::App, buffer::Buffer, custom_greys::CustomGreys};
impl Widget for &App { impl Widget for &App {
fn render(self, area: Rect, buf: &mut ratatui::buffer::Buffer) { fn render(self, area: Rect, buf: &mut ratatui::buffer::Buffer) {
self.current_buffer().render(area, buf); if self.buffers.len() == 1 {
self.current_buffer().render(area, buf);
} else {
let tab_bar_area = Rect::new(area.x, area.y, area.width, 1);
self.render_tab_bar().render(tab_bar_area, buf);
let buffer_area = Rect::new(area.x, area.y + 1, area.width, area.height - 1);
self.current_buffer().render(buffer_area, buf);
}
}
}
impl App {
fn render_tab_bar(&self) -> Line<'static> {
self.buffers
.iter()
.enumerate()
.map(|(index, buffer)| self.tab_for(buffer, index == self.current_buffer_index))
.collect()
}
fn tab_for(&self, buffer: &Buffer, is_active: bool) -> Span<'static> {
let background = if is_active {
Color::select_grey()
} else {
Color::ui_grey()
};
Span::from(format!(" {} ", buffer.file_name))
.bg(background)
} }
} }
+2 -4
View File
@@ -53,8 +53,7 @@ impl Widget for &Buffer {
} }
impl Buffer { impl Buffer {
#[allow(mismatched_lifetime_syntaxes)] fn render_line(&self, address: usize, bytes: &[u8; BYTES_PER_LINE]) -> Line<'static> {
fn render_line(&self, address: usize, bytes: &[u8; BYTES_PER_LINE]) -> Line {
iter::once(address::render_address(address)) iter::once(address::render_address(address))
.chain(self.render_chunks(address, bytes)) .chain(self.render_chunks(address, bytes))
.chain(iter::once(" ".into())) .chain(iter::once(" ".into()))
@@ -62,8 +61,7 @@ impl Buffer {
.collect() .collect()
} }
#[allow(mismatched_lifetime_syntaxes)] fn render_partial_line(&self, address: usize, bytes: &[u8]) -> Line<'static> {
fn render_partial_line(&self, address: usize, bytes: &[u8]) -> Line {
iter::once(address::render_address(address)) iter::once(address::render_address(address))
.chain(self.render_partial_chunks(address, bytes)) .chain(self.render_partial_chunks(address, bytes))
.chain(iter::once(" ".into())) .chain(iter::once(" ".into()))