Radish alpha
r
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
bin/patch: Fix browser events
Erik Kundt committed 4 months ago
commit 1dcaec7d84a7cc816a36031084e2e76d0451c269
parent e7f3357
1 file changed +14 -14
modified bin/commands/patch/list.rs
@@ -284,6 +284,10 @@ impl Show<Message> for App {
                            }
                        },
                    );
+

+
                    if ui.has_input(|key| key == Key::Char('?')) {
+
                        ui.send_message(Message::Changed(Change::Page { page: Page::Help }));
+
                    }
                }

                Page::Help => {
@@ -364,23 +368,12 @@ impl App {
                        state: TableState::new(selected),
                    }));
                }
-

-
                // TODO(erikli): Should only work if table has focus
-
                if ui.has_input(|key| key == Key::Char('/')) {
-
                    ui.send_message(Message::ShowSearch);
-
                }
            },
        );
-
    }

-
    fn show_browser_footer(&self, frame: &mut Frame, ui: &mut im::Ui<Message>) {
-
        ui.layout(Layout::vertical([1, 1]), None, |ui| {
-
            self.show_browser_context(frame, ui);
-
            self.show_browser_shortcuts(frame, ui);
-
        });
-

-
        if ui.has_input(|key| key == Key::Char('?')) {
-
            ui.send_message(Message::Changed(Change::Page { page: Page::Help }));
+
        // TODO(erikli): Should only work if table has focus
+
        if ui.has_input(|key| key == Key::Char('/')) {
+
            ui.send_message(Message::ShowSearch);
        }
        if ui.has_input(|key| key == Key::Enter) {
            ui.send_message(Message::ExitFromMode);
@@ -397,6 +390,13 @@ impl App {
        }
    }

+
    fn show_browser_footer(&self, frame: &mut Frame, ui: &mut im::Ui<Message>) {
+
        ui.layout(Layout::vertical([1, 1]), None, |ui| {
+
            self.show_browser_context(frame, ui);
+
            self.show_browser_shortcuts(frame, ui);
+
        });
+
    }
+

    pub fn show_browser_search(&self, frame: &mut Frame, ui: &mut im::Ui<Message>) {
        let (mut search_text, mut search_cursor) = (
            self.state.search.clone().read().text,