bendns' repos / helix
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-term/src/ui/text.rs')
-rw-r--r--helix-term/src/ui/text.rs37
1 files changed, 6 insertions, 31 deletions
diff --git a/helix-term/src/ui/text.rs b/helix-term/src/ui/text.rs
index a9c99562..4641fae1 100644
--- a/helix-term/src/ui/text.rs
+++ b/helix-term/src/ui/text.rs
@@ -4,7 +4,7 @@ use tui::buffer::Buffer as Surface;
use helix_view::graphics::Rect;
pub struct Text {
- pub(crate) contents: tui::text::Text<'static>,
+ contents: String,
size: (u16, u16),
viewport: (u16, u16),
}
@@ -12,28 +12,18 @@ pub struct Text {
impl Text {
pub fn new(contents: String) -> Self {
Self {
- contents: tui::text::Text::from(contents),
- size: (0, 0),
- viewport: (0, 0),
- }
- }
-}
-
-impl From<tui::text::Text<'static>> for Text {
- fn from(contents: tui::text::Text<'static>) -> Self {
- Self {
contents,
size: (0, 0),
viewport: (0, 0),
}
}
}
-
impl Component for Text {
fn render(&mut self, area: Rect, surface: &mut Surface, _cx: &mut Context) {
use tui::widgets::{Paragraph, Widget, Wrap};
+ let contents = tui::text::Text::from(self.contents.clone());
- let par = Paragraph::new(&self.contents).wrap(Wrap { trim: false });
+ let par = Paragraph::new(contents).wrap(Wrap { trim: false });
// .scroll(x, y) offsets
par.render(area, surface);
@@ -41,27 +31,12 @@ impl Component for Text {
fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
if viewport != self.viewport {
- let width = std::cmp::min(self.contents.width() as u16, viewport.0);
- let height = std::cmp::min(self.contents.height() as u16, viewport.1);
+ let contents = tui::text::Text::from(self.contents.clone());
+ let width = std::cmp::min(contents.width() as u16, viewport.0);
+ let height = std::cmp::min(contents.height() as u16, viewport.1);
self.size = (width, height);
self.viewport = viewport;
}
Some(self.size)
}
}
-
-pub fn required_size(text: &tui::text::Text, max_text_width: u16) -> (u16, u16) {
- let mut text_width = 0;
- let mut height = 0;
- for content in &text.lines {
- height += 1;
- let content_width = content.width() as u16;
- if content_width > max_text_width {
- text_width = max_text_width;
- height += content_width.checked_div(max_text_width).unwrap_or(0);
- } else if content_width > text_width {
- text_width = content_width;
- }
- }
- (text_width, height)
-}