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

Skip width computation in print_styled

Browse Source
This commit is contained in:
Alexandre Bury 2019-03-20 16:57:48 -07:00
parent c9dc371223
commit aeb0d88987
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/printer.rs
View File

@ -101,7 +101,7 @@ impl<'a, 'b> Printer<'a, 'b> {
let Vec2 { mut x, y } = start.into(); let Vec2 { mut x, y } = start.into();
for span in text.spans() { for span in text.spans() {
self.with_style(*span.attr, |printer| { self.with_style(*span.attr, |printer| {
printer.print((x, y), span.content); printer.print_with_width((x, y), span.content, |_| span.width);
x += span.width; x += span.width;
}); });
} }
@ -111,7 +111,19 @@ impl<'a, 'b> Printer<'a, 'b> {
// We don't want people to start calling prints in parallel? // We don't want people to start calling prints in parallel?
/// Prints some text at the given position /// Prints some text at the given position
pub fn print<S: Into<Vec2>>(&self, start: S, text: &str) { pub fn print<S: Into<Vec2>>(&self, start: S, text: &str) {
// Where we are asked to start printing. Oh boy. self.print_with_width(start, text, UnicodeWidthStr::width);
}
/// Prints some text, using the given callback to compute width.
///
/// Mostly used with `UnicodeWidthStr::width`.
/// If you already know the width, you can give it as a constant instead.
fn print_with_width<S, F>(&self, start: S, text: &str, width: F)
where
S: Into<Vec2>,
F: FnOnce(&str) -> usize,
{
// Where we are asked to start printing. Oh boy. It's not that simple.
let start = start.into(); let start = start.into();
// We accept requests between `content_offset` and // We accept requests between `content_offset` and
@ -129,7 +141,7 @@ impl<'a, 'b> Printer<'a, 'b> {
return; return;
} }
let mut text_width = text.width(); let mut text_width = width(text);
// If we're waaaay too far left, just give up. // If we're waaaay too far left, just give up.
if hidden_part.x > text_width { if hidden_part.x > text_width {