Skip to content

Commit

Permalink
Update ratatui
Browse files Browse the repository at this point in the history
  • Loading branch information
lusingander committed Jun 25, 2024
1 parent d4afab7 commit 02cb921
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 32 deletions.
37 changes: 20 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ categories = ["development-tools::cargo-plugins", "command-line-utilities"]
cargo_metadata = "0.18.1"
clap = { version = "4.5.4", features = ["derive"] }
console = "0.15.8"
crossterm = "0.27.0"
ratatui = "0.26.3"
ratatui = "0.27.0"
tui-input = "0.8.0"
16 changes: 8 additions & 8 deletions src/macros.rs
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
#[macro_export]
macro_rules! key_code {
( $code:path ) => {
crossterm::event::KeyEvent { code: $code, .. }
ratatui::crossterm::event::KeyEvent { code: $code, .. }
};
}

#[macro_export]
macro_rules! key_code_char {
( $c:ident ) => {
crossterm::event::KeyEvent {
code: crossterm::event::KeyCode::Char($c),
ratatui::crossterm::event::KeyEvent {
code: ratatui::crossterm::event::KeyCode::Char($c),
..
}
};
( $c:expr ) => {
crossterm::event::KeyEvent {
code: crossterm::event::KeyCode::Char($c),
ratatui::crossterm::event::KeyEvent {
code: ratatui::crossterm::event::KeyCode::Char($c),
..
}
};
( $c:expr, Ctrl ) => {
crossterm::event::KeyEvent {
code: crossterm::event::KeyCode::Char($c),
modifiers: crossterm::event::KeyModifiers::CONTROL,
ratatui::crossterm::event::KeyEvent {
code: ratatui::crossterm::event::KeyCode::Char($c),
modifiers: ratatui::crossterm::event::KeyModifiers::CONTROL,
..
}
};
Expand Down
11 changes: 7 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ use std::{
};

use clap::{Args, Parser, ValueEnum};
use crossterm::{
execute,
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
use ratatui::{
backend::CrosstermBackend,
crossterm::{
execute,
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
},
Terminal, TerminalOptions, Viewport,
};
use ratatui::{backend::CrosstermBackend, Terminal, TerminalOptions, Viewport};
use tui::{Ret, Tui};

#[derive(Debug, Parser)]
Expand Down
2 changes: 1 addition & 1 deletion src/tui.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use console::truncate_str;
use crossterm::event::{self, Event, KeyCode};
use ratatui::{
backend::Backend,
crossterm::event::{self, Event, KeyCode},
layout::{Constraint, Layout, Rect},
style::{Color, Style, Stylize},
text::{Line, Text},
Expand Down

0 comments on commit 02cb921

Please sign in to comment.