Widget trait simplification
This merges the view into the widget trait and removes unnecessary generic backend parameter.
12 files changed
+596
-689
956ca70f
→
5e71e1d7
modified bin/commands/inbox/select.rs
@@ -18,9 +18,8 @@ use tui::cob::inbox::{self};
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -210,7 +209,9 @@ pub enum Action {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -279,7 +280,7 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified bin/commands/inbox/select/ui.rs
@@ -7,7 +7,6 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -22,16 +21,14 @@ use tui::ui::widget::container::{
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -106,23 +103,86 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -192,19 +252,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -262,75 +309,16 @@ where
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -381,22 +369,29 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -430,14 +425,6 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -451,12 +438,11 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -464,6 +450,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -487,24 +477,21 @@ impl<'a> From<&State> for HelpPageProps<'a> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -578,17 +565,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -602,12 +578,14 @@ where
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -633,6 +611,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/issue/select.rs
@@ -15,9 +15,8 @@ use tui::cob::issue;
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -129,8 +128,8 @@ pub enum Action {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -185,6 +184,8 @@ impl store::State<Action, Selection> for State {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -198,7 +199,7 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified bin/commands/issue/select/ui.rs
@@ -9,7 +9,6 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -25,7 +24,7 @@ use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState};
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -34,7 +33,7 @@ use crate::tui_issue::common::Mode;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -120,23 +119,100 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -195,19 +271,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -267,89 +330,16 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -400,22 +390,29 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -449,14 +446,6 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -470,12 +459,11 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -483,6 +471,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -506,24 +498,21 @@ impl<'a> From<&State> for HelpPageProps<'a> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -597,17 +586,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -621,12 +599,14 @@ where
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -652,6 +632,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/patch/select.rs
@@ -15,10 +15,9 @@ use tui::cob::patch;
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -134,8 +133,8 @@ pub enum Action {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -190,6 +189,8 @@ impl store::State<Action, Selection> for State {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -203,7 +204,7 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified bin/commands/patch/select/ui.rs
@@ -8,7 +8,6 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -26,9 +25,7 @@ use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState};
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -36,7 +33,7 @@ use crate::tui_patch::common::PatchOperation;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -121,23 +118,110 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -196,19 +280,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -285,99 +356,16 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -428,22 +416,29 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -477,14 +472,6 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -498,12 +485,11 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -511,6 +497,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -534,24 +524,21 @@ impl<'a> From<&State> for HelpPageProps<'a> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -625,17 +612,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -649,12 +625,14 @@ where
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -680,6 +658,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/store.rs
@@ -13,13 +13,15 @@ const STORE_TICK_RATE: Duration = Duration::from_millis(1000);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -29,7 +31,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -38,7 +40,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -56,7 +58,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/ui.rs
@@ -7,11 +7,8 @@ pub mod theme;
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -19,11 +16,8 @@ use super::event::Event;
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| - | |
|
|
|
|
|
@@ -71,8 +65,8 @@ impl<A> Frontend<A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified src/ui/widget.rs
@@ -18,7 +18,7 @@ use ratatui::widgets::{Cell, Row, TableState};
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -33,18 +33,47 @@ pub struct BaseView<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -53,7 +82,7 @@ pub trait View<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -61,47 +90,13 @@ pub trait View<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -155,35 +150,32 @@ impl<Id> Default for WindowProps<Id> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -199,13 +191,7 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -213,11 +199,14 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -225,16 +214,10 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -252,6 +235,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -310,7 +297,10 @@ impl<S, A> Shortcuts<S, A> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -322,22 +312,13 @@ impl<S, A> View<S, A> for Shortcuts<S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -378,6 +359,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -540,10 +525,13 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -556,22 +544,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -601,13 +573,19 @@ where
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -664,6 +642,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/ui/widget/container.rs
@@ -11,7 +11,7 @@ use ratatui::widgets::{Block, BorderType, Borders, Row};
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -77,7 +77,10 @@ impl<'a, S, A> Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -89,8 +92,10 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -101,17 +106,6 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -168,6 +162,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -232,40 +230,7 @@ impl<'a, S, A> Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
| - | |
|
|
|
|
|
@@ -289,10 +254,35 @@ impl<'a, S, A> Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -328,6 +318,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -350,46 +344,40 @@ impl ContainerProps {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -408,8 +396,10 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -429,17 +419,6 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -487,4 +466,8 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
modified src/ui/widget/input.rs
@@ -5,11 +5,11 @@ use termion::event::Key;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -126,7 +126,10 @@ impl<S, A> TextField<S, A> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -142,23 +145,6 @@ impl<S, A> View<S, A> for TextField<S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -184,12 +170,20 @@ impl<S, A> View<S, A> for TextField<S, A> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -241,4 +235,8 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
modified src/ui/widget/text.rs
@@ -4,11 +4,10 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -142,7 +141,10 @@ impl<'a, S, A> Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -161,15 +163,6 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -200,12 +193,12 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -219,4 +212,8 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|