Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/rmux_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crates/rmux-app/assets/rmux_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions crates/rmux-app/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,15 @@ impl RmuxApp {
cwd.as_deref(),
bg_opacity,
);
if let Some(terminal) = self
.workspace_manager
.active_mut()
.root
.find_pane_mut(new_id)
.and_then(|pane| pane.active_terminal_mut())
{
terminal.set_focus(true);
}
let workspace_id = self.workspace_manager.active().id.0;
self.publish_event(
"pane.created",
Expand Down
5 changes: 5 additions & 0 deletions crates/rmux-app/src/workspace/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ impl WorkspaceManager {
let ws = &mut self.workspaces[index];
let active = ws.active_pane_id();
let new_id = ws.split_right(active, &mut self.next_pane_id, &mut self.next_split_id)?;
ws.active_pane = new_id;
self.check_pane_guardrail();
Ok(new_id)
}
Expand All @@ -312,6 +313,7 @@ impl WorkspaceManager {
let ws = &mut self.workspaces[index];
let active = ws.active_pane_id();
let new_id = ws.split_down(active, &mut self.next_pane_id, &mut self.next_split_id)?;
ws.active_pane = new_id;
self.check_pane_guardrail();
Ok(new_id)
}
Expand Down Expand Up @@ -824,6 +826,7 @@ mod tests {
let new_id = manager.split_active_right().unwrap();
assert_eq!(manager.total_pane_count(), 2);
assert!(new_id.0 > 0);
assert_eq!(manager.active().active_pane, new_id);
}

#[test]
Expand All @@ -834,6 +837,7 @@ mod tests {
let new_id = manager.split_active_down().unwrap();
assert_eq!(manager.total_pane_count(), 2);
assert!(new_id.0 > 0);
assert_eq!(manager.active().active_pane, new_id);
}

#[test]
Expand Down Expand Up @@ -1132,6 +1136,7 @@ mod tests {
let mut manager = WorkspaceManager::new();
let original_pane = manager.active().active_pane;
manager.split_active_right().expect("split ok");
manager.focus_pane_global(original_pane);
manager.new_surface_in_active(None).unwrap();
manager.new_surface_in_active(None).unwrap();
manager.close_surface_in_active_with_capture(None).expect("close should succeed");
Expand Down
Loading