diff --git a/majc/src/main.rs b/majc/src/main.rs index 48167a7..7d4a42a 100644 --- a/majc/src/main.rs +++ b/majc/src/main.rs @@ -1,7 +1,7 @@ use cursive::{ event::Key, menu::MenuTree, - theme::{Effect, Style, Color, PaletteColor, Theme}, + theme::{BaseColor, BorderStyle, Color, Effect, PaletteColor, Style, Theme}, traits::*, utils::markup::StyledString, views::{Dialog, EditView, Panel, ResizedView, TextView}, @@ -38,9 +38,8 @@ fn main() { env!("CARGO_PKG_AUTHORS"), ))); }) - .leaf("Help", move |s| { - help(s); - }), + .leaf("Help", help) + .leaf("Quit", cursive::Cursive::quit), ) .add_leaf("Open", |s| open_prompt(s)); @@ -170,10 +169,9 @@ fn render_gemini(body: &str) -> StyledString { Text(line) => styled.append(StyledString::plain(line)), Link { to, name } => match name { None => styled.append(StyledString::styled(to, Style::from(Effect::Underline))), - Some(name) => styled.append(StyledString::styled( - format!("{}: {}", to, name), - Style::from(Effect::Underline), - )), + Some(name) => { + styled.append(StyledString::styled(name, Style::from(Effect::Underline))) + } }, Preformatted(data) => styled.append(StyledString::plain(data)), Heading { level: _, body } => { @@ -193,6 +191,12 @@ fn custom_theme_from_cursive(siv: &Cursive) -> Theme { let mut theme = siv.current_theme().clone(); theme.palette[PaletteColor::Background] = Color::TerminalDefault; + theme.palette[PaletteColor::View] = Color::TerminalDefault; + theme.palette[PaletteColor::Primary] = Color::Dark(BaseColor::White); + theme.palette[PaletteColor::TitlePrimary] = Color::Light(BaseColor::White); + + theme.shadow = false; + theme.borders = BorderStyle::Simple; theme }