From 63d4410fdfe7712faec287aee2f5c0ca288dc996 Mon Sep 17 00:00:00 2001 From: lukeflo Date: Sat, 22 Feb 2025 00:48:41 +0100 Subject: replace Config crate with Figment -> better merging of default and config values --- src/tui/popup.rs | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'src/tui/popup.rs') diff --git a/src/tui/popup.rs b/src/tui/popup.rs index 6a2e8ff..f226429 100644 --- a/src/tui/popup.rs +++ b/src/tui/popup.rs @@ -89,31 +89,16 @@ impl PopupArea { for (keys, help) in help { if help == "first" { helptext.push(Line::from( - Span::raw(keys).bold().fg(cfg - .colors - .as_ref() - .unwrap() - .main_text_color - .unwrap()), + Span::raw(keys).bold().fg(cfg.colors.main_text_color), )) } else if help == "sub" { helptext.push(Line::from("")); helptext.push(Line::from( - Span::raw(keys).bold().fg(cfg - .colors - .as_ref() - .unwrap() - .main_text_color - .unwrap()), + Span::raw(keys).bold().fg(cfg.colors.main_text_color), )) } else { helptext.push(Line::from(vec![ - Span::raw(keys).bold().fg(cfg - .colors - .as_ref() - .unwrap() - .main_text_color - .unwrap()), + Span::raw(keys).bold().fg(cfg.colors.main_text_color), Span::raw(help), ])) } -- cgit v1.2.3