From 770beedb4466c02a8dc34fc0e1ef2af7bb421331 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sat, 11 Feb 2023 12:01:52 -0330 Subject: constants --- src/ui.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/ui.rs') diff --git a/src/ui.rs b/src/ui.rs index 1b50fb5..3d09221 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -12,7 +12,7 @@ use tui::{ Frame, Terminal, }; -use crate::{Calculator, Function}; +use crate::{Calculator, Constant, Function}; const WIDTH: u16 = 32; @@ -78,10 +78,7 @@ fn input_buffer_widget(input_buffer: &str) -> impl Widget { Span::raw(">"), Span::styled( format!(" {}", input_buffer), - match Function::parse(&input_buffer) { - Ok(_) => Style::default().add_modifier(Modifier::BOLD), - Err(_) => Style::default(), - }, + input_buffer_style(input_buffer), ), ])) .block(Block::default().borders(Borders::ALL)) @@ -91,3 +88,13 @@ fn version_number_widget() -> impl Widget { Paragraph::new(format!("pfc-{}", option_env!("CARGO_PKG_VERSION").unwrap())) .alignment(Alignment::Center) } + +fn input_buffer_style(input_buffer: &str) -> Style { + if let Ok(_) = Function::parse(&input_buffer) { + Style::default().add_modifier(Modifier::BOLD) + } else if let Ok(_) = Constant::parse(&input_buffer) { + Style::default().add_modifier(Modifier::BOLD) + } else { + Style::default() + } +} -- cgit v1.2.3