Skip to content

Always forward refresh events #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marstaik wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Always forward refresh events #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
193cda8
always forward refresh events
marstaik Jul 17, 2024
164b3b7
Update cursive-core to 0.4.0
gyscos Aug 2, 2024
3bcbb7a
Merge branch 'gyscos/master' into ms-refresh
marstaik Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
23 changes: 16 additions & 7 deletions src/panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<EventResult, CannotFocus> {
Expand Down
50 changes: 25 additions & 25 deletions tests/snapshots/end2end__end2end_add_at_action_change_tab.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

50 changes: 25 additions & 25 deletions tests/snapshots/end2end__end2end_vertical_left_with_action_change_tab.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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