Introduce window and make widget code more concise
This introduces a new window widget and allows to pass it as root to the frontend. It also improves the properties and callback interfaces. Last but not least, the span interface is simplified.
13 files changed
+651
-878
e2346edc
→
cf32da9a
modified bin/commands/inbox/select.rs
@@ -18,14 +18,16 @@ use tui::cob::inbox::{self};
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -274,15 +276,27 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
modified bin/commands/inbox/select/ui.rs
@@ -30,107 +30,11 @@ use tui::Selection;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -203,7 +107,7 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -211,7 +115,7 @@ struct BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -251,7 +155,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -287,12 +191,12 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -302,8 +206,8 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -369,41 +273,29 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -448,7 +340,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -504,7 +396,7 @@ pub struct Search<B: Backend> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -515,7 +407,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -536,7 +428,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -545,8 +437,8 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -614,7 +506,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -656,7 +548,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -677,7 +569,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -692,7 +584,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -701,13 +593,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -733,7 +626,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -763,126 +656,84 @@ fn help_text() -> Text<'static> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/issue/select.rs
@@ -15,14 +15,16 @@ use tui::cob::issue;
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
|
|
| - | |
|
|
|
|
|
@@ -193,15 +195,27 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
modified bin/commands/issue/select/ui.rs
@@ -33,107 +33,11 @@ use tui::Selection;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -217,7 +121,7 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -225,7 +129,7 @@ struct BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -254,7 +158,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -290,7 +194,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -299,14 +203,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -374,55 +278,37 @@ where
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -473,7 +359,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -529,7 +415,7 @@ pub struct Search<B: Backend> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -540,7 +426,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -561,7 +447,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -570,8 +456,8 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -639,7 +525,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -681,7 +567,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -702,7 +588,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -717,7 +603,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -726,13 +612,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -758,7 +645,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified bin/commands/patch/select.rs
@@ -15,13 +15,19 @@ use tui::cob::patch;
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -194,15 +200,27 @@ impl App {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
modified bin/commands/patch/select/ui.rs
@@ -35,108 +35,12 @@ use tui::Selection;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -218,7 +122,7 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -226,7 +130,7 @@ struct BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -255,7 +159,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -291,7 +195,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -300,14 +204,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -393,66 +297,45 @@ impl<'a, B: Backend> BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -463,7 +346,7 @@ impl<'a, B: Backend> BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -471,9 +354,8 @@ impl<'a, B: Backend> BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -493,8 +375,7 @@ impl<'a, B: Backend> BrowsePage<'a, B> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -505,7 +386,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -561,7 +442,7 @@ pub struct Search<B: Backend> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -572,7 +453,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -593,7 +474,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -602,8 +483,8 @@ impl<B: Backend> View<State, Action> for Search<B> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -640,7 +521,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -671,7 +552,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -713,7 +594,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -734,7 +615,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -749,7 +630,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -758,13 +639,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -790,7 +672,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -820,134 +702,89 @@ fn help_text() -> Text<'static> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/ui.rs
@@ -13,7 +13,7 @@ use std::time::Duration;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -32,14 +32,21 @@ pub struct Frontend<A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -56,7 +63,13 @@ impl<A> Frontend<A> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/ui/items.rs
@@ -249,39 +249,39 @@ impl ToRow for NotificationItem {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -492,35 +492,35 @@ impl ToRow for IssueItem {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -744,32 +744,32 @@ impl ToRow for PatchItem {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/ui/span.rs
@@ -7,75 +7,75 @@ pub fn blank() -> Span<'static> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
modified src/ui/widget.rs
@@ -4,7 +4,9 @@ pub mod text;
|
|
|
|
|
|
| + | |
|
|
| + | |
|
|
|
|
|
@@ -32,7 +34,7 @@ pub trait View<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -51,12 +53,20 @@ pub trait View<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -93,6 +103,143 @@ pub trait Properties {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -135,7 +282,7 @@ pub struct Shortcuts<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -161,12 +308,12 @@ impl<S, A> View<S, A> for Shortcuts<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -178,10 +325,8 @@ impl<S, A> View<S, A> for Shortcuts<S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -193,7 +338,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -335,7 +480,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -405,7 +550,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -414,16 +559,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -458,8 +601,8 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -471,7 +614,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -517,7 +660,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/ui/widget/container.rs
@@ -60,7 +60,7 @@ pub struct Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -87,7 +87,7 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -96,8 +96,8 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -109,8 +109,8 @@ impl<'a: 'static, S, A> View<S, A> for Header<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -121,7 +121,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -224,7 +224,7 @@ pub struct Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -251,7 +251,7 @@ impl<'a: 'static, S, A> View<S, A> for Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -260,8 +260,8 @@ impl<'a: 'static, S, A> View<S, A> for Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -273,8 +273,8 @@ impl<'a: 'static, S, A> View<S, A> for Footer<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -309,7 +309,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -375,7 +375,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -419,7 +419,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -428,16 +428,14 @@ where
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -465,7 +463,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/ui/widget/input.rs
@@ -63,7 +63,7 @@ pub struct TextField<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -136,7 +136,7 @@ impl<S, A> View<S, A> for TextField<S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -149,8 +149,8 @@ impl<S, A> View<S, A> for TextField<S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -188,8 +188,8 @@ impl<S, A> View<S, A> for TextField<S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -200,7 +200,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified src/ui/widget/text.rs
@@ -67,7 +67,7 @@ pub struct Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -155,7 +155,7 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -163,8 +163,8 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -174,10 +174,8 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -206,8 +204,8 @@ impl<'a: 'static, S, A> View<S, A> for Paragraph<'a, S, A> {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -218,7 +216,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|