From 193cda88cb9ae5164c546712495f52a08703f522 Mon Sep 17 00:00:00 2001 From: Marios Staikopoulos Date: Wed, 17 Jul 2024 16:02:28 +0300 Subject: [PATCH 1/2] always forward refresh events --- src/panel.rs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/panel.rs b/src/panel.rs index 2ec0bb8..21f7e73 100644 --- a/src/panel.rs +++ b/src/panel.rs @@ -492,13 +492,22 @@ impl View for TabPanel { } fn on_event(&mut self, evt: Event) -> EventResult { - let result = self.check_focus_grab(&evt); - - result.and(if self.bar_focused { - self.on_event_focused(evt) - } else { - self.on_event_unfocused(evt) - }) + match evt { + Event::Refresh => { + self.tabs.on_event(Event::Refresh); + self.bar.on_event(Event::Refresh); + EventResult::Consumed(None) + } + _ => { + let result = self.check_focus_grab(&evt); + + result.and(if self.bar_focused { + self.on_event_focused(evt) + } else { + self.on_event_unfocused(evt) + }) + } + } } fn take_focus(&mut self, d: Direction) -> Result { From 164b3b7b176bcad6ed7b888aa948faecfae95d6b Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Fri, 2 Aug 2024 18:28:37 -0400 Subject: [PATCH 2/2] Update cursive-core to 0.4.0 --- Cargo.toml | 4 +- ...end__end2end_add_at_action_change_tab.snap | 50 +++++++++---------- ..._vertical_left_with_action_change_tab.snap | 50 +++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e61203..1705c94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,12 +13,12 @@ documentation = "https://docs.rs/cursive-tabs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cursive_core = "0.3" +cursive_core = "0.4" crossbeam = "0.8" log = "0.4" num = "0.4" [dev-dependencies] serde_json = "1.0.74" -cursive = "0.17.0" +cursive = "0.21.0" insta = "1.10.0" diff --git a/tests/snapshots/end2end__end2end_add_at_action_change_tab.snap b/tests/snapshots/end2end__end2end_add_at_action_change_tab.snap index f91352d..9c2373f 100644 --- a/tests/snapshots/end2end__end2end_add_at_action_change_tab.snap +++ b/tests/snapshots/end2end__end2end_add_at_action_change_tab.snap @@ -1,32 +1,32 @@ --- source: tests/end2end.rs +assertion_line: 107 expression: tsiv.last_screen() --- captured piece: x01234567890123456789012345678901234567890123456789012345678901234567890123456789x -0................................................................................| -1................................................................................| -2................................................................................| -3................................................................................| -4................................................................................| -5................................................................................| -6................................................................................| -7................................................................................| -8................................................................................| -9................................................................................| -0................................................................................| -1.....................................Second.....................................| -2...................................... ....................................| -3................................................................................| -4................................................................................| -5................................................................................| -6................................................................................| -7................................................................................| -8................................................................................| -9................................................................................| -0................................................................................| -1................................................................................| -2................................................................................| -3................................................................................| +0 | +1 | +2 | +3 | +4 | +5 | +6 | +7 | +8 | +9 | +0 | +1 Second | +2 | +3 | +4 | +5 | +6 | +7 | +8 | +9 | +0 | +1 | +2 | +3 | x--------------------------------------------------------------------------------x - diff --git a/tests/snapshots/end2end__end2end_vertical_left_with_action_change_tab.snap b/tests/snapshots/end2end__end2end_vertical_left_with_action_change_tab.snap index c5dcb95..663f4a3 100644 --- a/tests/snapshots/end2end__end2end_vertical_left_with_action_change_tab.snap +++ b/tests/snapshots/end2end__end2end_vertical_left_with_action_change_tab.snap @@ -1,32 +1,32 @@ --- source: tests/end2end.rs +assertion_line: 215 expression: tsiv.last_screen() --- captured piece: x01234567890123456789012345678901234567890123456789012345678901234567890123456789x -0................................................................................| -1................................................................................| -2................................................................................| -3................................................................................| -4................................................................................| -5................................................................................| -6................................................................................| -7................................................................................| -8............................. ┌─────┐..............................| -9............................. ━━━━━━━━━━━━━Pshhh│ .............................| -0............................. Stronk test h │ .............................| -1.............................━━━━━━━━━━━━━━━ │ .............................| -2............................. Stronker test │ .............................| -3.............................──────────────┬ │ .............................| -4............................. └─────┘ .............................| -5.............................. .............................| -6................................................................................| -7................................................................................| -8................................................................................| -9................................................................................| -0................................................................................| -1................................................................................| -2................................................................................| -3................................................................................| +0 | +1 | +2 | +3 | +4 | +5 | +6 | +7 | +8 ┌─────┐ | +9 ━━━━━━━━━━━━━Pshhh│ | +0 Stronk test h │ | +1 ━━━━━━━━━━━━━━━ │ | +2 Stronker test │ | +3 ──────────────┬ │ | +4 └─────┘ | +5 | +6 | +7 | +8 | +9 | +0 | +1 | +2 | +3 | x--------------------------------------------------------------------------------x -