radicle/radicle-tui
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git synced 2026-11-12 06:30:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

bin: Various small rendering refactorings

Browse Source
This commit is contained in:
Erik Kundt
2024-04-17 13:56:42 +02:00
parent 4e69e0ad74
commit 3e2fe1541b
3 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/commands/inbox/select/ui.rs
+14 -14
View File
@@ -281,15 +281,7 @@ where
)
}),
),
footer: Footer::new(state, action_tx)
.on_update(|state| {
let props = NotificationsProps::from(state);
Box::<FooterProps<'_>>::new(
FooterProps::default().columns(Self::build_footer(&props, props.selected)),
)
})
.to_boxed(),
footer: Footer::new(state, action_tx).to_boxed(),
on_update: None,
on_change: None,
}
@@ -436,7 +428,11 @@ impl<'a: 'static, B> Widget<B, State, Action> for Notifications<'a, B>
where
B: Backend + 'a,
{
fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) {
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) {
let props = props
.downcast_ref::<NotificationsProps>()
.unwrap_or(&self.props);
let header_height = 3_usize;
let page_size = if self.props.show_search {
@@ -447,7 +443,11 @@ where
let layout = Layout::vertical([Constraint::Min(1), Constraint::Length(3)]).split(area);
self.table.render(frame, layout[0], &());
self.footer.render(frame, layout[1], &());
self.footer.render(
frame,
layout[1],
&FooterProps::default().columns(Self::build_footer(props, props.selected)),
);
(area.height as usize).saturating_sub(header_height)
};
@@ -485,7 +485,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
});
})
.on_update(|state| {
Box::<TextFieldProps>::new(
Box::new(
TextFieldProps::default()
.text(&state.search.read().to_string())
.title("Search")
@@ -718,7 +718,7 @@ impl<'a, B: Backend> View<State, Action> for Help<'a, B> {
.on_update(|state| {
let props = HelpProps::from(state);
Box::<ParagraphProps<'_>>::new(
Box::new(
ParagraphProps::default()
.text(&props.content)
.page_size(props.page_size)
@@ -770,7 +770,7 @@ where
B: Backend,
{
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) {
let props = props.downcast_ref::<HelpProps<'_>>().unwrap_or(&self.props);
let props = props.downcast_ref::<HelpProps>().unwrap_or(&self.props);
let [header_area, content_area, footer_area] = Layout::vertical([
Constraint::Length(3),
bin/commands/issue/select/ui.rs
+9 -11
View File
@@ -265,7 +265,7 @@ where
.to_boxed(),
)
.on_change(|props, action_tx| {
if let Some(props) = props.downcast_ref::<TableProps<'_, IssueItem>>() {
if let Some(props) = props.downcast_ref::<TableProps<IssueItem>>() {
let _ = action_tx.send(Action::Select {
selected: props.selected,
});
@@ -274,7 +274,7 @@ where
.on_update(|state| {
let props = IssuesProps::from(state);
Box::<TableProps<'_, IssueItem>>::new(
Box::new(
TableProps::default()
.columns(props.columns)
.items(state.issues())
@@ -454,13 +454,11 @@ where
B: Backend + 'a,
{
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) {
let props = props
.downcast_ref::<IssuesProps<'_>>()
.unwrap_or(&self.props);
let props = props.downcast_ref::<IssuesProps>().unwrap_or(&self.props);
let header_height = 3_usize;
let page_size = if self.props.show_search {
let page_size = if props.show_search {
self.table.render(frame, area, &());
(area.height as usize).saturating_sub(header_height)
@@ -471,13 +469,13 @@ where
self.footer.render(
frame,
layout[1],
&FooterProps::default().columns(Self::build_footer(&props, props.selected)),
&FooterProps::default().columns(Self::build_footer(props, props.selected)),
);
(area.height as usize).saturating_sub(header_height)
};
if page_size != self.props.page_size {
if page_size != props.page_size {
let _ = self.action_tx.send(Action::PageSize(page_size));
}
}
@@ -510,7 +508,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
});
})
.on_update(|state| {
Box::<TextFieldProps>::new(
Box::new(
TextFieldProps::default()
.text(&state.search.read().to_string())
.title("Search")
@@ -743,7 +741,7 @@ impl<'a, B: Backend> View<State, Action> for Help<'a, B> {
.on_update(|state| {
let props = HelpProps::from(state);
Box::<ParagraphProps<'_>>::new(
Box::new(
ParagraphProps::default()
.text(&props.content)
.page_size(props.page_size)
@@ -795,7 +793,7 @@ where
B: Backend,
{
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) {
let props = props.downcast_ref::<HelpProps<'_>>().unwrap_or(&self.props);
let props = props.downcast_ref::<HelpProps>().unwrap_or(&self.props);
let [header_area, content_area, footer_area] = Layout::vertical([
Constraint::Length(3),
bin/commands/patch/select/ui.rs
+7 -9
View File
@@ -274,7 +274,7 @@ where
.on_update(|state| {
let props = PatchesProps::from(state);
Box::<TableProps<'_, PatchItem>>::new(
Box::new(
TableProps::default()
.columns(props.columns)
.items(state.patches())
@@ -485,13 +485,11 @@ where
B: Backend + 'a,
{
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) {
let props = props
.downcast_ref::<PatchesProps<'_>>()
.unwrap_or(&self.props);
let props = props.downcast_ref::<PatchesProps>().unwrap_or(&self.props);
let header_height = 3_usize;
let page_size = if self.props.show_search {
let page_size = if props.show_search {
self.table.render(frame, area, &());
(area.height as usize).saturating_sub(header_height)
@@ -502,13 +500,13 @@ where
self.footer.render(
frame,
layout[1],
&FooterProps::default().columns(Self::build_footer(&props, props.selected)),
&FooterProps::default().columns(Self::build_footer(props, props.selected)),
);
(area.height as usize).saturating_sub(header_height)
};
if page_size != self.props.page_size {
if page_size != props.page_size {
let _ = self.action_tx.send(Action::PageSize(page_size));
}
}
@@ -541,7 +539,7 @@ impl<B: Backend> View<State, Action> for Search<B> {
});
})
.on_update(|state| {
Box::<TextFieldProps>::new(
Box::new(
TextFieldProps::default()
.text(&state.search.read().to_string())
.title("Search")
@@ -782,7 +780,7 @@ impl<'a, B: Backend> View<State, Action> for Help<'a, B> {
.on_update(|state| {
let props = HelpProps::from(state);
Box::<ParagraphProps<'_>>::new(
Box::new(
ParagraphProps::default()
.text(&props.content)
.page_size(props.page_size)