Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make editor breadcrumb look better #109

Merged
merged 1 commit into from
Jan 18, 2025
+47 −14
Merged

Make editor breadcrumb look better #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tui/src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ pub const GRAY_LIGHT: Color = Color::Indexed(250);
pub const GRAY_WHITE: Color = Color::Indexed(253);
pub const WHITE: Color = Color::White;
pub const BLACK: Color = Color::Black;

pub const GRAY_A: Color = Color::Indexed(246);
pub const GRAY_B: Color = Color::Indexed(248);
58 changes: 44 additions & 14 deletions tui/src/views/body/notebook/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const NOTE_SYMBOL: &str = "󱇗 ";
pub fn draw(frame: &mut Frame, area: Rect, context: &mut Context) {
context.notebook.editor_height = area.height - 2;

let (title, breadcrumb) = if let Some(tab_index) = context.notebook.tab_index {
let (title, mut bottom_left) = if let Some(tab_index) = context.notebook.tab_index {
let mut title = vec![];
for (i, tab) in context.notebook.tabs.iter().enumerate() {
let name = format!(" {NOTE_SYMBOL}{} ", tab.note.name.clone());
Expand All @@ -36,25 +36,55 @@ pub fn draw(frame: &mut Frame, area: Rect, context: &mut Context) {
}

let title = Line::from(title);
let breadcrumb = Span::raw(format!(
" {} ",
context.notebook.tabs[tab_index].breadcrumb.join("/")
))
.fg(BLACK)
.bg(GREEN);
let mut breadcrumb = vec![];
let last_index = context.notebook.tabs[tab_index].breadcrumb.len() - 1;

for (i, name) in context.notebook.tabs[tab_index]
.breadcrumb
.iter()
.enumerate()
{
let (color_a, color_b) = if i % 2 == 0 {
(GRAY_A, GRAY_B)
} else {
(GRAY_B, GRAY_A)
};

let name = if i == 0 {
breadcrumb.push(Span::raw(" 󰝰 ").fg(YELLOW).bg(color_a));
format!("{name} ")
} else if i == last_index {
format!(" 󱇗 {name} ")
} else {
breadcrumb.push(Span::raw(" 󰝰 ").fg(YELLOW).bg(color_a));
format!("{name} ")
};

breadcrumb.push(Span::raw(name).fg(BLACK).bg(color_a));

if i < last_index {
breadcrumb.push(Span::raw("").fg(color_a).bg(color_b));
} else {
breadcrumb.push(Span::raw("").fg(color_a).bg(GRAY_BLACK));
}
}

(title, breadcrumb)
} else {
(Line::from("[Editor]".fg(GRAY_DIM)), Span::default())
(Line::from("[Editor]".fg(GRAY_DIM)), vec![Span::default()])
};

let mode = match context.notebook.state {
ContextState::EditorNormalMode { .. } => Span::raw(" NORMAL ").fg(WHITE).bg(BLACK),
ContextState::EditorInsertMode => Span::raw(" INSERT ").fg(BLACK).bg(YELLOW),
ContextState::EditorVisualMode => Span::raw(" VISUAL ").fg(WHITE).bg(RED),
_ => Span::raw(" ").bg(GRAY_DARK),
let (mode, bg) = match context.notebook.state {
ContextState::EditorNormalMode { .. } => (Span::raw(" NORMAL ").fg(WHITE).bg(BLACK), BLACK),
ContextState::EditorInsertMode => (Span::raw(" INSERT ").fg(BLACK).bg(YELLOW), YELLOW),
ContextState::EditorVisualMode => (Span::raw(" VISUAL ").fg(WHITE).bg(RED), RED),
_ => (Span::raw(" ").bg(GRAY_DARK), GRAY_DARK),
};

let bottom_left = Line::from(vec![mode, breadcrumb]);
bottom_left.insert(0, mode);
bottom_left.insert(1, Span::raw("").fg(bg).bg(GRAY_A));

let bottom_left = Line::from(bottom_left);
let block = Block::new().title(title).title_bottom(bottom_left);
let block = match (
context.last_log.as_ref(),
Expand Down
Loading