diff --git a/bin/commands/inbox/list.rs b/bin/commands/inbox/list.rs index cbb03d2a..16a88f83 100644 --- a/bin/commands/inbox/list.rs +++ b/bin/commands/inbox/list.rs @@ -536,7 +536,7 @@ impl App { } }; - ui.bar(frame, context, Some(Borders::None)); + ui.column_bar(frame, context, Some(Borders::None)); } pub fn show_browser_shortcuts(&self, frame: &mut Frame, ui: &mut im::Ui) { @@ -565,7 +565,7 @@ impl App { None, |ui| { ui.label(frame, ""); - ui.columns( + ui.column_bar( frame, [Column::new( Span::raw(" Loading ").magenta().slow_blink(), @@ -583,7 +583,7 @@ impl App { } fn show_help_text(&self, frame: &mut Frame, ui: &mut im::Ui) { - ui.columns( + ui.column_bar( frame, [Column::new(Span::raw(" Help ").bold(), Constraint::Fill(1))].to_vec(), Some(Borders::Top), @@ -604,7 +604,7 @@ impl App { } fn show_help_context(&self, frame: &mut Frame, ui: &mut im::Ui) { - ui.bar( + ui.column_bar( frame, [ Column::new( diff --git a/bin/commands/patch/list.rs b/bin/commands/patch/list.rs index 8e3ebb50..89d573a4 100644 --- a/bin/commands/patch/list.rs +++ b/bin/commands/patch/list.rs @@ -561,7 +561,7 @@ impl App { } }; - ui.bar(frame, context, Some(Borders::None)); + ui.column_bar(frame, context, Some(Borders::None)); } pub fn show_browser_shortcuts(&self, frame: &mut Frame, ui: &mut im::Ui) { @@ -584,7 +584,7 @@ impl App { } fn show_help_text(&self, frame: &mut Frame, ui: &mut im::Ui) { - ui.columns( + ui.column_bar( frame, [Column::new(Span::raw(" Help ").bold(), Constraint::Fill(1))].to_vec(), Some(Borders::Top), @@ -605,7 +605,7 @@ impl App { } fn show_help_context(&self, frame: &mut Frame, ui: &mut im::Ui) { - ui.bar( + ui.column_bar( frame, [ Column::new( diff --git a/bin/commands/patch/review.rs b/bin/commands/patch/review.rs index 5c65e97c..b39edc57 100644 --- a/bin/commands/patch/review.rs +++ b/bin/commands/patch/review.rs @@ -360,7 +360,7 @@ impl App<'_> { .unwrap_or_default(); ui.container(layout::container(), 1, |ui| { - ui.columns(frame, hunk.inner().header(), Some(Borders::Top)); + ui.column_bar(frame, hunk.inner().header(), Some(Borders::Top)); if let Some(text) = hunk.inner().hunk_text() { let diff = ui.text_view(frame, text, &mut cursor, Some(Borders::BottomSides)); @@ -409,7 +409,7 @@ impl App<'_> { ), }; - ui.bar( + ui.column_bar( frame, [ Column::new( @@ -526,7 +526,7 @@ impl Show for App<'_> { }; let header = [Column::new(" Help ", Constraint::Fill(1))].to_vec(); - ui.columns(frame, header, Some(Borders::Top)); + ui.column_bar(frame, header, Some(Borders::Top)); let help = ui.text_view( frame, help_text().to_string(), diff --git a/bin/ui/im.rs b/bin/ui/im.rs index f33b6894..129fc0f5 100644 --- a/bin/ui/im.rs +++ b/bin/ui/im.rs @@ -124,7 +124,7 @@ where ]), Some(1), |ui| { - ui.columns(frame, self.header.clone().to_vec(), Some(Borders::Top)); + ui.column_bar(frame, self.header.clone().to_vec(), Some(Borders::Top)); let table = ui.table( frame, @@ -151,7 +151,7 @@ where self.search.write(TextEditState { text, cursor }); response.changed |= text_edit.changed; } else { - ui.columns(frame, self.footer.clone().to_vec(), Some(Borders::Bottom)); + ui.column_bar(frame, self.footer.clone().to_vec(), Some(Borders::Bottom)); } }, ); diff --git a/examples/selection.rs b/examples/selection.rs index 348cb7e1..e6e5c295 100644 --- a/examples/selection.rs +++ b/examples/selection.rs @@ -96,7 +96,7 @@ impl Show for App { .to_vec(); let mut selected = self.selector.selected(); - ui.columns(frame, columns.clone(), Some(Borders::None)); + ui.column_bar(frame, columns.clone(), Some(Borders::None)); let table = ui.table( frame, diff --git a/src/ui/im.rs b/src/ui/im.rs index cbb80034..16bfd619 100644 --- a/src/ui/im.rs +++ b/src/ui/im.rs @@ -585,22 +585,13 @@ where widget::Shortcuts::new(shortcuts, divider).ui(self, frame) } - pub fn columns( + pub fn column_bar( &mut self, frame: &mut Frame, columns: Vec>, borders: Option, ) -> Response { - widget::Columns::new(columns, borders).ui(self, frame) - } - - pub fn bar( - &mut self, - frame: &mut Frame, - columns: Vec>, - borders: Option, - ) -> Response { - widget::Bar::new(columns, borders).ui(self, frame) + widget::ColumnBar::new(columns, borders).ui(self, frame) } pub fn text_view<'a>( @@ -634,7 +625,7 @@ where Some(label) => widget::TextEdit::new(text, cursor, borders) .with_label(label) .ui(self, frame), - None => widget::TextEdit::new(text, cursor, borders).ui(self, frame), + _ => widget::TextEdit::new(text, cursor, borders).ui(self, frame), } } } diff --git a/src/ui/im/widget.rs b/src/ui/im/widget.rs index 94125597..6d22b41f 100644 --- a/src/ui/im/widget.rs +++ b/src/ui/im/widget.rs @@ -577,7 +577,7 @@ where Layout::vertical([Constraint::Length(3), Constraint::Min(1)]), 1, |ui| { - ui.columns(frame, self.header.clone().to_vec(), Some(Borders::Top)); + ui.column_bar(frame, self.header.clone().to_vec(), Some(Borders::Top)); let table = ui.table( frame, @@ -595,18 +595,18 @@ where } } -pub struct Columns<'a> { +pub struct ColumnBar<'a> { columns: Vec>, borders: Option, } -impl<'a> Columns<'a> { +impl<'a> ColumnBar<'a> { pub fn new(columns: Vec>, borders: Option) -> Self { Self { columns, borders } } } -impl Widget for Columns<'_> { +impl Widget for ColumnBar<'_> { fn ui(self, ui: &mut Ui, frame: &mut Frame) -> Response where M: Clone,