diff --git a/examples/ratatui_editor.rs b/examples/ratatui_editor.rs index 251ca70..73189f9 100644 --- a/examples/ratatui_editor.rs +++ b/examples/ratatui_editor.rs @@ -8,7 +8,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::style::{Color, Modifier, Style}; -use ratatui::text::{Span, Spans}; +use ratatui::text::{Line, Span}; use ratatui::widgets::{Block, Borders, Paragraph}; use ratatui::Terminal; use std::borrow::Cow; @@ -225,9 +225,9 @@ impl<'a> Editor<'a> { // Render message at bottom let message = if let Some(message) = self.message.take() { - Spans::from(Span::raw(message)) + Line::from(Span::raw(message)) } else if search_height > 0 { - Spans::from(vec![ + Line::from(vec![ Span::raw("Press "), Span::styled("Enter", Style::default().add_modifier(Modifier::BOLD)), Span::raw(" to jump to first match and close, "), @@ -245,7 +245,7 @@ impl<'a> Editor<'a> { Span::raw(" to search previous"), ]) } else { - Spans::from(vec![ + Line::from(vec![ Span::raw("Press "), Span::styled("^Q", Style::default().add_modifier(Modifier::BOLD)), Span::raw(" to quit, "), diff --git a/examples/ratatui_termion.rs b/examples/ratatui_termion.rs index cc6ecc0..3a73fe2 100644 --- a/examples/ratatui_termion.rs +++ b/examples/ratatui_termion.rs @@ -9,7 +9,7 @@ use std::time::Duration; use termion::event::Event as TermEvent; use termion::input::{MouseTerminal, TermRead}; use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; +use termion::screen::IntoAlternateScreen; use tui_textarea::{Input, Key, TextArea}; enum Event { @@ -18,9 +18,8 @@ enum Event { } fn main() -> Result<(), Box> { - let stdout = io::stdout().into_raw_mode()?; + let stdout = io::stdout().into_raw_mode()?.into_alternate_screen()?; let stdout = MouseTerminal::from(stdout); - let stdout = AlternateScreen::from(stdout); let backend = TermionBackend::new(stdout); let mut term = Terminal::new(backend)?; diff --git a/examples/termion.rs b/examples/termion.rs index 3d7e2b4..63ac412 100644 --- a/examples/termion.rs +++ b/examples/termion.rs @@ -6,7 +6,7 @@ use std::time::Duration; use termion::event::Event as TermEvent; use termion::input::{MouseTerminal, TermRead}; use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; +use termion::screen::IntoAlternateScreen; use tui::backend::TermionBackend; use tui::widgets::{Block, Borders}; use tui::Terminal; @@ -18,9 +18,8 @@ enum Event { } fn main() -> Result<(), Box> { - let stdout = io::stdout().into_raw_mode()?; + let stdout = io::stdout().into_raw_mode()?.into_alternate_screen()?; let stdout = MouseTerminal::from(stdout); - let stdout = AlternateScreen::from(stdout); let backend = TermionBackend::new(stdout); let mut term = Terminal::new(backend)?;