Skip to content

Update to modalkit{,-ratatui}@0.0.20 #319

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

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Update to modalkit{,-ratatui}@0.0.20 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ edit = "0.1.4"
humansize = "2.0.0"

[dependencies.modalkit]
version = "0.0.19"
version = "0.0.20"
#git = "https://github.com/ulyssa/modalkit"
#rev = "cb8c8aeb9a499b9b16615ce144f9014d78036e01"
#rev = "24f3ec11c7f634005a27b26878d0fbbdcc08f272"

[dependencies.modalkit-ratatui]
version = "0.0.19"
version = "0.0.20"
#git = "https://github.com/ulyssa/modalkit"
#rev = "cb8c8aeb9a499b9b16615ce144f9014d78036e01"
#rev = "24f3ec11c7f634005a27b26878d0fbbdcc08f272"

[dependencies.matrix-sdk]
version = "0.7.1"
Expand Down
33 changes: 23 additions & 10 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ use modalkit::{

use modalkit_ratatui::{
cmdbar::CommandBarState,
screen::{Screen, ScreenState, TabLayoutDescription},
windows::WindowLayoutDescription,
screen::{Screen, ScreenState, TabbedLayoutDescription},
windows::{WindowLayoutDescription, WindowLayoutState},
TerminalCursor,
TerminalExtOps,
Window,
Expand Down Expand Up @@ -176,6 +176,17 @@ fn config_tab_to_desc(
Ok(desc)
}

fn restore_layout(
area: Rect,
settings: &ApplicationSettings,
store: &mut ProgramStore,
) -> IambResult<FocusList<WindowLayoutState<IambWindow, IambInfo>>> {
let layout = std::fs::read(&settings.layout_json)?;
let tabs: TabbedLayoutDescription<IambInfo> =
serde_json::from_slice(&layout).map_err(IambError::from)?;
tabs.to_layout(area.into(), store)
}

fn setup_screen(
settings: ApplicationSettings,
store: &mut ProgramStore,
Expand All @@ -186,12 +197,14 @@ fn setup_screen(

match settings.layout {
config::Layout::Restore => {
if let Ok(layout) = std::fs::read(&settings.layout_json) {
let tabs: TabLayoutDescription<IambInfo> =
serde_json::from_slice(&layout).map_err(IambError::from)?;
let tabs = tabs.to_layout(area.into(), store)?;

return Ok(ScreenState::from_list(tabs, cmd));
match restore_layout(area, &settings, store) {
Ok(tabs) => {
return Ok(ScreenState::from_list(tabs, cmd));
},
Err(e) => {
// Log the issue with restoring and then continue.
tracing::warn!(err = %e, "Failed to restore layout from disk");
},
}
},
config::Layout::New => {},
Expand Down Expand Up @@ -242,7 +255,7 @@ struct Application {
focused: bool,

/// The tab layout before the last executed [TabAction].
last_layout: Option<TabLayoutDescription<IambInfo>>,
last_layout: Option<TabbedLayoutDescription<IambInfo>>,

/// Whether we need to do a full redraw (e.g., after running a subprocess).
dirty: bool,
Expand Down Expand Up @@ -479,7 +492,7 @@ impl Application {
None
},
Action::Command(act) => {
let acts = store.application.cmds.command(&act, &ctx)?;
let acts = store.application.cmds.command(&act, &ctx, &mut store.registers)?;
self.action_prepend(acts);

None
Expand Down
8 changes: 3 additions & 5 deletions src/windows/room/scrollback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,8 +673,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let dir = ctx.get_search_regex_dir();
let dir = flip.resolve(&dir);

let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
let lsearch = store.registers.get_last_search().to_string();
let needle = Regex::new(lsearch.as_ref())?;

let (mc, needs_load) = self.find_message(key, dir, &needle, count, info);
Expand Down Expand Up @@ -753,8 +752,7 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let dir = ctx.get_search_regex_dir();
let dir = flip.resolve(&dir);

let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
let lsearch = store.registers.get_last_search().to_string();
let needle = Regex::new(lsearch.as_ref())?;

let (mc, needs_load) = self.find_message(key, dir, &needle, count, info);
Expand Down Expand Up @@ -1452,7 +1450,7 @@ mod tests {
// MSG4: "help"
// MSG5: "character"
// MSG1: "writhe"
store.set_last_search("he");
store.registers.set_last_search("he");

assert_eq!(scrollback.cursor, MessageCursor::latest());

Expand Down