Radish alpha
r
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
lib: Improve text widget interface
Erik Kundt committed 4 months ago
commit ad4d4a045a82814a4c94d61f9b1249bea0a6f123
parent 1150aa7
4 files changed +13 -20
modified bin/commands/inbox/list.rs
@@ -416,11 +416,11 @@ impl App {
        );
        let mut search = self.state.search.clone();

-
        let text_edit = ui.text_edit_labeled_singleline(
+
        let text_edit = ui.text_edit_singleline(
            frame,
            &mut search_text,
            &mut search_cursor,
-
            "Search".to_string(),
+
            Some("Search".to_string()),
            Some(Borders::Spacer { top: 0, left: 0 }),
        );

modified bin/commands/patch/list.rs
@@ -400,11 +400,11 @@ impl App {
        );
        let mut search = self.state.search.clone();

-
        let text_edit = ui.text_edit_labeled_singleline(
+
        let text_edit = ui.text_edit_singleline(
            frame,
            &mut search_text,
            &mut search_cursor,
-
            "Search".to_string(),
+
            Some("Search".to_string()),
            Some(Borders::Spacer { top: 0, left: 0 }),
        );

modified bin/ui/im.rs
@@ -141,11 +141,11 @@ where
                response.changed |= table.changed;

                if *self.show_search {
-
                    let text_edit = ui.text_edit_labeled_singleline(
+
                    let text_edit = ui.text_edit_singleline(
                        frame,
                        &mut text,
                        &mut cursor,
-
                        "Search".to_string(),
+
                        Some("Search".to_string()),
                        Some(Borders::Spacer { top: 0, left: 1 }),
                    );
                    self.search.write(TextEditState { text, cursor });
modified src/ui/im.rs
@@ -627,21 +627,14 @@ where
        frame: &mut Frame,
        text: &mut String,
        cursor: &mut usize,
+
        label: Option<impl ToString>,
        borders: Option<Borders>,
    ) -> Response {
-
        widget::TextEdit::new(text, cursor, borders).ui(self, frame)
-
    }
-

-
    pub fn text_edit_labeled_singleline(
-
        &mut self,
-
        frame: &mut Frame,
-
        text: &mut String,
-
        cursor: &mut usize,
-
        label: impl ToString,
-
        border: Option<Borders>,
-
    ) -> Response {
-
        widget::TextEdit::new(text, cursor, border)
-
            .with_label(label)
-
            .ui(self, frame)
+
        match label {
+
            Some(label) => widget::TextEdit::new(text, cursor, borders)
+
                .with_label(label)
+
                .ui(self, frame),
+
            None => widget::TextEdit::new(text, cursor, borders).ui(self, frame),
+
        }
    }
}