vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use default color if Text span part is Reset

Browse Source
This commit is contained in:
veeso
2021-04-03 17:27:43 +02:00
parent 37da49f4f8
commit f8a448f5e9
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/activities/auth_activity/view.rs
View File

@@ -61,7 +61,6 @@ impl AuthActivity {
super::COMPONENT_TEXT_FOOTER, super::COMPONENT_TEXT_FOOTER,
Box::new(Text::new( Box::new(Text::new(
PropsBuilder::default() PropsBuilder::default()
.with_foreground(Color::White)
.with_texts(TextParts::new( .with_texts(TextParts::new(
None, None,
Some(vec![ Some(vec![
@@ -158,7 +157,8 @@ impl AuthActivity {
super::COMPONENT_TEXT_NEW_VERSION, super::COMPONENT_TEXT_NEW_VERSION,
Box::new(Text::new( Box::new(Text::new(
PropsBuilder::default() PropsBuilder::default()
.with_texts(TextParts::new(None, Some(vec![TextSpanBuilder::new(format!("TermSCP {} is now available! Download it from <https://github.com/veeso/termscp/releases/latest>", version).as_str()).with_foreground(Color::Yellow).bold().build()]))) .with_foreground(Color::Yellow)
.with_texts(TextParts::new(None, Some(vec![TextSpan::from(format!("TermSCP {} is now available! Download it from <https://github.com/veeso/termscp/releases/latest>", version))])))
.build() .build()
)) ))
); );

15
src/ui/layout/components/text.rs
View File

@@ -30,7 +30,7 @@ use super::{Canvas, Component, InputEvent, Msg, Payload, Props, PropsBuilder};
// ext // ext
use tui::{ use tui::{
layout::Rect, layout::Rect,
style::Style, style::{Color, Style},
text::{Span, Spans, Text as TuiText}, text::{Span, Spans, Text as TuiText},
widgets::Paragraph, widgets::Paragraph,
}; };
@@ -64,12 +64,21 @@ impl Component for Text {
Some(rows) => rows Some(rows) => rows
.iter() .iter()
.map(|x| { .map(|x| {
// Keep line color, or use default
let fg: Color = match x.fg {
Color::Reset => self.props.foreground,
_ => x.fg,
};
let bg: Color = match x.bg {
Color::Reset => self.props.background,
_ => x.bg,
};
Span::styled( Span::styled(
x.content.clone(), x.content.clone(),
Style::default() Style::default()
.add_modifier(x.get_modifiers()) .add_modifier(x.get_modifiers())
.fg(x.fg) .fg(fg)
.bg(x.bg), .bg(bg),
) )
}) })
.collect(), .collect(),