Radish alpha
r
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
lib: Improve container widget naming
Erik Kundt committed 4 months ago
commit 1150aa7ab52c68b4521bf5f54094cfd806a57ab7
parent 9ecc962
5 files changed +9 -9
modified bin/commands/inbox/list.rs
@@ -311,7 +311,7 @@ impl Show<Message> for App {
                        Constraint::Length(1),
                    ]);

-
                    ui.composite(layout, 1, |ui| {
+
                    ui.container(layout, 1, |ui| {
                        self.show_help_text(frame, ui);
                        self.show_help_context(frame, ui);

modified bin/commands/patch/list.rs
@@ -296,7 +296,7 @@ impl Show<Message> for App {
                        Constraint::Length(1),
                    ]);

-
                    ui.composite(layout, 1, |ui| {
+
                    ui.container(layout, 1, |ui| {
                        self.show_help_text(frame, ui);
                        self.show_help_context(frame, ui);

modified bin/commands/patch/review.rs
@@ -359,7 +359,7 @@ impl App<'_> {
                .map(|state| state.cursor)
                .unwrap_or_default();

-
            ui.composite(layout::container(), 1, |ui| {
+
            ui.container(layout::container(), 1, |ui| {
                ui.columns(frame, hunk.inner().header(), Some(Borders::Top));

                if let Some(text) = hunk.inner().hunk_text() {
@@ -519,7 +519,7 @@ impl Show<Message> for App<'_> {
                }
                AppPage::Help => {
                    ui.layout(layout::page(), Some(0), |ui| {
-
                        ui.composite(layout::container(), 1, |ui| {
+
                        ui.container(layout::container(), 1, |ui| {
                            let mut cursor = {
                                let state = self.state.lock().unwrap();
                                state.help.cursor()
modified src/ui/im.rs
@@ -500,7 +500,7 @@ where
        widget::Panes::new(len, focus).show(&mut child_ui, add_contents)
    }

-
    pub fn composite<R>(
+
    pub fn container<R>(
        &mut self,
        layout: impl Into<Layout>,
        focus: usize,
@@ -511,7 +511,7 @@ where
        let mut child_ui = self.child_ui(area, layout);
        child_ui.has_focus = area_focus;

-
        widget::Composite::new(focus).show(&mut child_ui, add_contents)
+
        widget::Container::new(focus).show(&mut child_ui, add_contents)
    }

    pub fn popup<R>(
modified src/ui/im/widget.rs
@@ -176,11 +176,11 @@ impl CompositeState {
    }
}

-
pub struct Composite {
+
pub struct Container {
    focus: usize,
}

-
impl Composite {
+
impl Container {
    pub fn new(focus: usize) -> Self {
        Self { focus }
    }
@@ -573,7 +573,7 @@ where
    {
        let mut response = Response::default();

-
        ui.composite(
+
        ui.container(
            Layout::vertical([Constraint::Length(3), Constraint::Min(1)]),
            1,
            |ui| {