diff --git a/src/ui/activities/auth_activity/mod.rs b/src/ui/activities/auth_activity/mod.rs index 84bbac1..055ac64 100644 --- a/src/ui/activities/auth_activity/mod.rs +++ b/src/ui/activities/auth_activity/mod.rs @@ -194,7 +194,7 @@ impl Activity for AuthActivity { } /// ### will_umount - /// + /// /// `will_umount` is the method which must be able to report to the activity manager, whether /// the activity should be terminated or not. /// If not, the call will return `None`, otherwise return`Some(ExitReason)` diff --git a/src/ui/activities/auth_activity/view.rs b/src/ui/activities/auth_activity/view.rs index 89ea500..07b9d2f 100644 --- a/src/ui/activities/auth_activity/view.rs +++ b/src/ui/activities/auth_activity/view.rs @@ -26,8 +26,8 @@ // Locals use super::{AuthActivity, Context, FileTransferProtocol}; use crate::ui::layout::components::{ - bookmark_list::BookmarkList, msgbox::MsgBox, input::Input, radio_group::RadioGroup, table::Table, - text::Text, title::Title, + bookmark_list::BookmarkList, input::Input, msgbox::MsgBox, radio_group::RadioGroup, + table::Table, text::Text, title::Title, }; use crate::ui::layout::props::{ InputType, PropValue, PropsBuilder, TableBuilder, TextParts, TextSpan, TextSpanBuilder, diff --git a/src/ui/activities/setup_activity/view.rs b/src/ui/activities/setup_activity/view.rs index 92211bd..9b40d98 100644 --- a/src/ui/activities/setup_activity/view.rs +++ b/src/ui/activities/setup_activity/view.rs @@ -29,8 +29,8 @@ use super::{Context, SetupActivity, ViewLayout}; use crate::filetransfer::FileTransferProtocol; use crate::fs::explorer::GroupDirs; use crate::ui::layout::components::{ - bookmark_list::BookmarkList, msgbox::MsgBox, input::Input, radio_group::RadioGroup, table::Table, - text::Text, + bookmark_list::BookmarkList, input::Input, msgbox::MsgBox, radio_group::RadioGroup, + table::Table, text::Text, }; use crate::ui::layout::props::{ PropValue, PropsBuilder, TableBuilder, TextParts, TextSpan, TextSpanBuilder, diff --git a/src/ui/input.rs b/src/ui/input.rs index e556998..2b69b48 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -52,16 +52,16 @@ impl InputHandler { match self.read_event() { Ok(ev_opt) => match ev_opt { Some(ev) => inbox.push(ev), - None => break + None => break, }, - Err(_) => return Err(()) + Err(_) => return Err(()), } } Ok(inbox) } /// ### read_event - /// + /// /// Read event from input listener pub(crate) fn read_event(&self) -> Result, ()> { if let Ok(available) = poll(Duration::from_millis(10)) { @@ -74,7 +74,7 @@ impl InputHandler { Err(()) } } - false => Ok(None) + false => Ok(None), } } else { Err(()) diff --git a/src/ui/layout/components/input.rs b/src/ui/layout/components/input.rs index a74a533..75efa83 100644 --- a/src/ui/layout/components/input.rs +++ b/src/ui/layout/components/input.rs @@ -206,8 +206,7 @@ impl Component for Input { render.render_widget(p, area); // Set cursor, if focus if self.states.focus { - let x: u16 = - area.x + (self.states.cursor as u16) + 1; + let x: u16 = area.x + (self.states.cursor as u16) + 1; render.set_cursor(x, area.y + 1); } } diff --git a/src/ui/layout/components/title.rs b/src/ui/layout/components/title.rs index 5e39ff3..38632bd 100644 --- a/src/ui/layout/components/title.rs +++ b/src/ui/layout/components/title.rs @@ -26,11 +26,7 @@ // locals use super::{Canvas, Component, InputEvent, Msg, Payload, Props, PropsBuilder}; // ext -use tui::{ - layout::Rect, - style::Style, - widgets::Paragraph, -}; +use tui::{layout::Rect, style::Style, widgets::Paragraph}; // -- state diff --git a/src/ui/layout/mod.rs b/src/ui/layout/mod.rs index 4b9bd54..9e3fe46 100644 --- a/src/ui/layout/mod.rs +++ b/src/ui/layout/mod.rs @@ -26,8 +26,8 @@ // Modules pub mod components; pub mod props; -pub mod view; pub mod utils; +pub mod view; // locals use props::{PropValue, Props, PropsBuilder}; diff --git a/src/ui/layout/view.rs b/src/ui/layout/view.rs index b191e0f..1ea96c9 100644 --- a/src/ui/layout/view.rs +++ b/src/ui/layout/view.rs @@ -185,7 +185,9 @@ impl View { if let Some(active_component) = self.focus.take() { if active_component != component { // Blur active component if are different - if let Some(active_component) = self.components.get_mut(active_component.as_str()) { + if let Some(active_component) = + self.components.get_mut(active_component.as_str()) + { active_component.blur(); } }