From ca9d77b6a21bf949039d79fbeb29dcc435a79717 Mon Sep 17 00:00:00 2001 From: Yifan Song Date: Wed, 27 Sep 2023 13:43:29 +0200 Subject: [PATCH] merge select into THEME system: opener <-> select --- app/src/select/select.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/select/select.rs b/app/src/select/select.rs index 3912e47d..5d7a7c91 100644 --- a/app/src/select/select.rs +++ b/app/src/select/select.rs @@ -1,6 +1,7 @@ -use core::Ctx; +use config::THEME; +use ratatui::{buffer::Buffer, layout::Rect, widgets::{Block, BorderType, Borders, Clear, List, ListItem, Widget}}; -use ratatui::{buffer::Buffer, layout::Rect, style::{Color, Style}, widgets::{Block, BorderType, Borders, Clear, List, ListItem, Widget}}; +use crate::Ctx; pub(crate) struct Select<'a> { cx: &'a Ctx, @@ -21,10 +22,10 @@ impl<'a> Widget for Select<'a> { .enumerate() .map(|(i, v)| { if i != select.rel_cursor() { - return ListItem::new(format!(" {v}")); + return ListItem::new(format!(" {v}")).style(THEME.opener.inactive.get()); } - ListItem::new(format!(" {v}")).style(Style::new().fg(Color::Magenta)) + ListItem::new(format!(" {v}")).style(THEME.opener.active.get()) }) .collect::>(); @@ -35,7 +36,7 @@ impl<'a> Widget for Select<'a> { .title(select.title()) .borders(Borders::ALL) .border_type(BorderType::Rounded) - .border_style(Style::new().fg(Color::Blue)), + .border_style(THEME.opener.border.get()), ) .render(area, buf); }