diff options
| author | Aram Drevekenin <aram@poor.dev> | 2023-09-18 15:18:00 +0200 |
|---|---|---|
| committer | Aram Drevekenin <aram@poor.dev> | 2023-09-18 15:18:00 +0200 |
| commit | 1dc23142fb90f63c9a495914f0b9d545b2def528 (patch) | |
| tree | e71dc24eb47bd2c624cba794bd8a7278bc39f2ac | |
| parent | ffde90e04c3fbd19a3f1363f06dbc1b2924fa174 (diff) | |
fix launch-or-focus should_float and in place behavior
| -rw-r--r-- | zellij-server/src/screen.rs | 6 | ||||
| -rw-r--r-- | zellij-utils/src/input/actions.rs | 26 |
2 files changed, 2 insertions, 30 deletions
diff --git a/zellij-server/src/screen.rs b/zellij-server/src/screen.rs index e66dbc000..fbf078841 100644 --- a/zellij-server/src/screen.rs +++ b/zellij-server/src/screen.rs @@ -3131,11 +3131,9 @@ pub(crate) fn screen_thread_main( match screen.active_tab_indices.values().next() { Some(tab_index) => { let size = Size::default(); - let should_float = None; - let should_be_in_place = true; screen.bus.senders.send_to_plugin(PluginInstruction::Load( - should_float, - should_be_in_place, + Some(should_float), + should_open_in_place, None, run_plugin, *tab_index, diff --git a/zellij-utils/src/input/actions.rs b/zellij-utils/src/input/actions.rs index 6a7d22e4c..9e77bb607 100644 --- a/zellij-utils/src/input/actions.rs +++ b/zellij-utils/src/input/actions.rs @@ -525,32 +525,6 @@ impl Action { move_to_focused_tab, configuration, } => { - // TODO: CONTINUE HERE (before vacation) - add an in_place flag and make it work - // - we already did this with the NewPane action above, to test: - // * cargo x run --singlepass - // * target/dev-opt/zellij action new-pane --in-place --plugin zellij:session-manager - // * this also already works with zellij run with the --in-place flag - // * we need to make it work with everything, then also make it work with plugins - // - make it work with LaunchOrFocusPlugin - DONE - // - make it work with the edit action - DONE - // - test with keybinding - // * run - DONE - // * launch_or_focus_plugin - DONE (has some issues, might want to test again - // with properly fixed monocle) - // - add to plugins (open_terminal_in_place, open_command_pane_in_place, - // open_file_in_place) <== CONTINUE HERE - // - test these with/without flag - // * zellij run - // * zellij action new-pane (command and plugin) - // * zellij action launch-or-focus-plugin - // * zellij action edit - // * zellij edit - // * keybinding - // - run - // - launch_or_focus_plugin - // * plugins (show_self/hide_self, open_file_in_place(n), - // open_terminal_in_place(n), open_command_pane_in_place(n)) - let current_dir = get_current_dir(); let run_plugin_location = RunPluginLocation::parse(url.as_str(), Some(current_dir)) .map_err(|e| format!("Failed to parse plugin location: {}", e))?; |