arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Add TextView::set_style

Browse Source
This commit is contained in:
Alexandre Bury 2020-12-18 13:58:33 -08:00
parent 40efcc6727
commit 368dca6033
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cursive-core/src/views/text_view.rs
View File

@ -6,7 +6,7 @@ use owning_ref::{ArcRef, OwningHandle};
use unicode_width::UnicodeWidthStr; use unicode_width::UnicodeWidthStr;
use crate::align::*; use crate::align::*;
use crate::theme::Effect; use crate::theme::{Effect, Style};
use crate::utils::lines::spans::{LinesIterator, Row}; use crate::utils::lines::spans::{LinesIterator, Row};
use crate::utils::markup::StyledString; use crate::utils::markup::StyledString;
use crate::view::{SizeCache, View}; use crate::view::{SizeCache, View};
@ -195,8 +195,7 @@ pub struct TextView {
align: Align, align: Align,
// TODO: remove now that we have styled text? style: Style,
effect: Effect,
// True if we can wrap long lines. // True if we can wrap long lines.
wrap: bool, wrap: bool,
@ -234,7 +233,7 @@ impl TextView {
pub fn new_with_content(content: TextContent) -> Self { pub fn new_with_content(content: TextContent) -> Self {
TextView { TextView {
content, content,
effect: Effect::Simple, style: Style::default(),
rows: Vec::new(), rows: Vec::new(),
wrap: true, wrap: true,
align: Align::top_left(), align: Align::top_left(),
@ -249,15 +248,29 @@ impl TextView {
} }
/// Sets the effect for the entire content. /// Sets the effect for the entire content.
#[deprecated = "Use `set_style()` instead."]
pub fn set_effect(&mut self, effect: Effect) { pub fn set_effect(&mut self, effect: Effect) {
self.effect = effect; self.set_style(effect);
}
/// Sets the style for the content.
pub fn set_style<S: Into<Style>>(&mut self, style: S) {
self.style = style.into();
} }
/// Sets the effect for the entire content. /// Sets the effect for the entire content.
/// ///
/// Chainable variant. /// Chainable variant.
#[deprecated = "Use `style()` instead."]
pub fn effect(self, effect: Effect) -> Self { pub fn effect(self, effect: Effect) -> Self {
self.with(|s| s.set_effect(effect)) self.style(effect)
}
/// Sets the style for the entire content.
///
/// Chainable variant.
pub fn style<S: Into<Style>>(self, style: S) -> Self {
self.with(|s| s.set_style(style))
} }
/// Disables content wrap for this view. /// Disables content wrap for this view.
@ -383,7 +396,7 @@ impl View for TextView {
let content = self.content.content.lock().unwrap(); let content = self.content.content.lock().unwrap();
printer.with_effect(self.effect, |printer| { printer.with_style(self.style, |printer| {
for (y, row) in self.rows.iter().enumerate() { for (y, row) in self.rows.iter().enumerate() {
let l = row.width; let l = row.width;
let mut x = self.align.h.get_offset(l, printer.size.x); let mut x = self.align.h.get_offset(l, printer.size.x);