From ff595cd0285aa2740e1735589d5ed8bc5c4d7d61 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Tue, 5 Nov 2019 16:33:57 -0500 Subject: [PATCH] Fanagle with tui. Going to probably put this on halt until tui-rs pushes a new stable release... --- Cargo.toml | 6 +++--- TODO.md | 14 +++++++------- src/canvas.rs | 23 ++++++++++++++--------- src/main.rs | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cd844b8c..e2f90ce5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" [dependencies] chrono = "0.4.9" clap = "2.33.0" -crossterm = "0.11.0" +crossterm = "^0.10" failure = "0.1.5" futures-preview = "0.3.0-alpha.18" fern = "0.5" @@ -34,8 +34,8 @@ winapi = "0.3.8" [dependencies.tui-temp-fork] #git = "https://github.com/ClementTsang/tui-rs" -#path = "../tui-rs" -version = "0.6.4" +path = "../tui-rs" +version = "0.6" default-features = false features = ['crossterm'] diff --git a/TODO.md b/TODO.md index 1d277c8a..96d52816 100644 --- a/TODO.md +++ b/TODO.md @@ -1,21 +1,19 @@ # To-Do List -Note this will probably migrate to GitHub's native Issues; this was mostly for personal use during early stages. - ## Want to do +- Bug for too small windows --- probably a TUI bug? + - Scaling in and out (zoom), may need to show zoom levels -- More keybinds (jumping, scaling) +- Filtering in processes (that is, allow searching) + +- More keybinds (jumping in scrolling (vim bindings?), scaling) - ~~Add custom error because it's really messy~~ Done, but need to implement across rest of app! - Efficiency... for example, reduce some redraw logic if possible (ie: no changes to dir sorting) -- Filtering in processes (that is, allow searching) - -- Probably good to add a "are you sure" to dd-ing... - ## Less important - Minimalist mode @@ -35,3 +33,5 @@ Note this will probably migrate to GitHub's native Issues; this was mostly for p - Grouping by process - Deal with async and stuff (remove if not needed) + +- Perhaps switch libraries...? diff --git a/src/canvas.rs b/src/canvas.rs index 33c136a0..f8c50577 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -269,7 +269,7 @@ pub fn draw_data(terminal : &mut Terminal, app_state : }), ) .header_style(Style::default().fg(Color::LightBlue)) - .widths(&[(width * 0.45) as u16, (width * 0.4) as u16]) + .widths(&[Constraint::Length((width * 0.45) as u16), Constraint::Length((width * 0.4) as u16)]) .render(&mut f, middle_divided_chunk_2[0]); } @@ -316,13 +316,13 @@ pub fn draw_data(terminal : &mut Terminal, app_state : ) .header_style(Style::default().fg(Color::LightBlue).modifier(Modifier::BOLD)) .widths(&[ - (width * 0.18).floor() as u16, - (width * 0.14).floor() as u16, - (width * 0.11).floor() as u16, - (width * 0.11).floor() as u16, - (width * 0.11).floor() as u16, - (width * 0.11).floor() as u16, - (width * 0.11).floor() as u16, + Constraint::Length((width * 0.18).floor() as u16), + Constraint::Length((width * 0.14).floor() as u16), + Constraint::Length((width * 0.11).floor() as u16), + Constraint::Length((width * 0.11).floor() as u16), + Constraint::Length((width * 0.11).floor() as u16), + Constraint::Length((width * 0.11).floor() as u16), + Constraint::Length((width * 0.11).floor() as u16), ]) .render(&mut f, middle_divided_chunk_2[1]); } @@ -435,7 +435,12 @@ pub fn draw_data(terminal : &mut Terminal, app_state : }), ) .header_style(Style::default().fg(Color::LightBlue)) - .widths(&[(width * 0.2) as u16, (width * 0.35) as u16, (width * 0.2) as u16, (width * 0.2) as u16]) + .widths(&[ + Constraint::Length((width * 0.2) as u16), + Constraint::Length((width * 0.35) as u16), + Constraint::Length((width * 0.2) as u16), + Constraint::Length((width * 0.2) as u16), + ]) .render(&mut f, bottom_chunks[1]); } } diff --git a/src/main.rs b/src/main.rs index f558641d..c9aa8a61 100644 --- a/src/main.rs +++ b/src/main.rs @@ -229,7 +229,7 @@ fn main() -> error::Result<()> { KeyEvent::ShiftUp => app.decrement_position_count(), KeyEvent::ShiftDown => app.increment_position_count(), KeyEvent::Char(c) => app.on_key(c), - KeyEvent::Enter => app.on_enter(), + //KeyEvent::Enter => app.on_enter(), KeyEvent::Esc => app.on_esc(), _ => {} }