Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Allow opening a new window by default (#58805)

Bennet Bo Fennerb27c1bb78e92
diff --git a/assets/icons/this_window.svg b/assets/icons/this_window.svg
new file mode 100644
index 00000000000..879bb5e9577
--- /dev/null
+++ b/assets/icons/this_window.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5468 7.40531L14.5468 3.93294C14.5468 3.5674 14.4016 3.21682 14.1431 2.95835C13.8846 2.69987 13.5341 2.55466 13.1685 2.55466H2.83141C2.46586 2.55466 2.11529 2.69987 1.85681 2.95835C1.59834 3.21682 1.45313 3.5674 1.45312 3.93294V10.8243C1.45312 11.5824 2.07335 12.2026 2.83141 12.2026H7.17117" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.423 9.8227L12.423 14.0673" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2993 12.4589L12.423 14.5826L14.5468 12.4589" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 158b554507f..9e735bdd9d5 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -602,15 +602,15 @@
{
"context": "Workspace",
"bindings": {
- "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
+ "alt-open": "projects::OpenRecent",
// Change the default action on `menu::Confirm` by setting the parameter
// "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
- "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": false }],
- "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
- "alt-shift-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+ "alt-ctrl-o": "projects::OpenRecent",
+ "ctrl-r": "projects::OpenRecent",
+ "alt-shift-open": ["projects::OpenRemote", { "from_existing_connection": false }],
// Change to open path modal for existing remote connection by setting the parameter
- // "alt-ctrl-shift-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
- "alt-ctrl-shift-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+ // "alt-ctrl-shift-o": ["projects::OpenRemote", { "from_existing_connection": true }],
+ "alt-ctrl-shift-o": ["projects::OpenRemote", { "from_existing_connection": false }],
"alt-ctrl-shift-b": "branches::OpenRecent",
"alt-ctrl-shift-w": "git::Worktree",
"alt-shift-enter": "toast::RunAction",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 0915f466366..7ad25ce6a48 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -667,10 +667,10 @@
"bindings": {
// Change the default action on `menu::Confirm` by setting the parameter
// "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
- "alt-cmd-o": ["projects::OpenRecent", { "create_new_window": false }],
- "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
- "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
- "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true, "create_new_window": false }],
+ "alt-cmd-o": "projects::OpenRecent",
+ "ctrl-r": "projects::OpenRecent",
+ "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false }],
+ "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true }],
"cmd-ctrl-b": "branches::OpenRecent",
"cmd-ctrl-w": "git::Worktree",
"ctrl-~": "workspace::NewTerminal",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 2097c9de0cd..f12157e68e3 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -602,10 +602,10 @@
"bindings": {
// Change the default action on `menu::Confirm` by setting the parameter
// "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
- "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
+ "ctrl-r": "projects::OpenRecent",
// Change to open path modal for existing remote connection by setting the parameter
- // "ctrl-shift-alt-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
- "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
+ // "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": true }],
+ "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false }],
"shift-alt-b": "branches::OpenRecent",
"shift-alt-w": "git::Worktree",
"shift-alt-enter": "toast::RunAction",
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 25084f304b6..011766943c0 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -150,6 +150,14 @@
// that are already part of an open project)
// "cli_default_open_behavior": "new_window"
"cli_default_open_behavior": "existing_window",
+ // The default behavior when opening projects from the UI.
+ //
+ // May take 2 values:
+ // 1. Open projects as a new workspace in the current Zed window's sidebar
+ // "default_open_behavior": "existing_window"
+ // 2. Open projects in a new window
+ // "default_open_behavior": "new_window"
+ "default_open_behavior": "existing_window",
// Whether to attempt to restore previous file's state when opening it again.
// The state is stored per pane.
// When disabled, defaults are applied instead of the state restoration.
diff --git a/crates/icons/src/icons.rs b/crates/icons/src/icons.rs
index 698818ced9f..68314ccff27 100644
--- a/crates/icons/src/icons.rs
+++ b/crates/icons/src/icons.rs
@@ -254,6 +254,7 @@ pub enum IconName {
TextUnwrap,
ThinkingMode,
ThinkingModeOff,
+ ThisWindow,
Thread,
ThreadFromSummary,
ThreadsSidebarLeftClosed,
diff --git a/crates/platform_title_bar/src/system_window_tabs.rs b/crates/platform_title_bar/src/system_window_tabs.rs
index f465d2ab847..507dac96327 100644
--- a/crates/platform_title_bar/src/system_window_tabs.rs
+++ b/crates/platform_title_bar/src/system_window_tabs.rs
@@ -484,7 +484,7 @@ impl Render for SystemWindowTabs {
.on_click(|_event, window, cx| {
window.dispatch_action(
Box::new(zed_actions::OpenRecent {
- create_new_window: true,
+ create_new_window: Some(true),
}),
cx,
);
diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs
index 2c69b75b865..938aa9eda33 100644
--- a/crates/recent_projects/src/recent_projects.rs
+++ b/crates/recent_projects/src/recent_projects.rs
@@ -35,7 +35,7 @@ use picker::{
use project::{Worktree, git_store::Repository};
pub use remote_connections::RemoteSettings;
pub use remote_servers::RemoteServerProjects;
-use settings::{Settings, WorktreeId};
+use settings::{DefaultOpenBehavior, Settings, WorktreeId};
use ui_input::ErasedEditor;
use workspace::ProjectGroupKey;
@@ -277,10 +277,19 @@ fn get_branch_for_worktree(
})
}
+pub(crate) fn default_open_in_new_window(cx: &App) -> bool {
+ matches!(
+ workspace::WorkspaceSettings::get_global(cx).default_open_behavior,
+ DefaultOpenBehavior::NewWindow
+ )
+}
+
pub fn init(cx: &mut App) {
#[cfg(target_os = "windows")]
cx.on_action(|open_wsl: &zed_actions::wsl_actions::OpenFolderInWsl, cx| {
- let create_new_window = open_wsl.create_new_window;
+ let create_new_window = open_wsl
+ .create_new_window
+ .unwrap_or_else(|| default_open_in_new_window(cx));
with_active_or_new_workspace(cx, move |workspace, window, cx| {
use gpui::PathPromptOptions;
use project::DirectoryLister;
@@ -364,7 +373,9 @@ pub fn init(cx: &mut App) {
#[cfg(target_os = "windows")]
cx.on_action(|open_wsl: &zed_actions::wsl_actions::OpenWsl, cx| {
- let create_new_window = open_wsl.create_new_window;
+ let create_new_window = open_wsl
+ .create_new_window
+ .unwrap_or_else(|| default_open_in_new_window(cx));
with_active_or_new_workspace(cx, move |workspace, window, cx| {
let handle = cx.entity().downgrade();
let fs = workspace.project().read(cx).fs().clone();
@@ -380,8 +391,15 @@ pub fn init(cx: &mut App) {
with_active_or_new_workspace(cx, move |workspace, window, cx| {
let fs = workspace.project().read(cx).fs().clone();
add_wsl_distro(fs, &open_wsl.distro, cx);
+ let requesting_window =
+ match workspace::WorkspaceSettings::get_global(cx).default_open_behavior {
+ DefaultOpenBehavior::ExistingWindow => {
+ window.window_handle().downcast::<MultiWorkspace>()
+ }
+ DefaultOpenBehavior::NewWindow => None,
+ };
let open_options = OpenOptions {
- requesting_window: window.window_handle().downcast::<MultiWorkspace>(),
+ requesting_window,
..Default::default()
};
@@ -468,7 +486,9 @@ pub fn init(cx: &mut App) {
});
cx.on_action(|open_remote: &OpenRemote, cx| {
let from_existing_connection = open_remote.from_existing_connection;
- let create_new_window = open_remote.create_new_window;
+ let create_new_window = open_remote
+ .create_new_window
+ .unwrap_or_else(|| default_open_in_new_window(cx));
with_active_or_new_workspace(cx, move |workspace, window, cx| {
if from_existing_connection {
cx.propagate();
@@ -664,7 +684,7 @@ impl RecentProjects {
pub fn open(
workspace: &mut Workspace,
- create_new_window: bool,
+ create_new_window: Option<bool>,
window_project_groups: Vec<ProjectGroupKey>,
window: &mut Window,
focus_handle: FocusHandle,
@@ -674,6 +694,8 @@ impl RecentProjects {
let open_folders = get_open_folders(workspace, cx);
let fs = Some(workspace.app_state().fs.clone());
+ let create_new_window = create_new_window.unwrap_or_else(|| default_open_in_new_window(cx));
+
workspace.toggle_modal(window, cx, |window, cx| {
let delegate = RecentProjectsDelegate::new(
weak,
@@ -691,7 +713,7 @@ impl RecentProjects {
pub fn popover(
workspace: WeakEntity<Workspace>,
window_project_groups: Vec<ProjectGroupKey>,
- create_new_window: bool,
+ create_new_window: Option<bool>,
focus_handle: FocusHandle,
window: &mut Window,
cx: &mut App,
@@ -707,6 +729,8 @@ impl RecentProjects {
})
.unwrap_or_else(|| (Vec::new(), None));
+ let create_new_window = create_new_window.unwrap_or_else(|| default_open_in_new_window(cx));
+
cx.new(|cx| {
let delegate = RecentProjectsDelegate::new(
workspace,
@@ -1504,6 +1528,21 @@ impl PickerDelegate for RecentProjectsDelegate {
};
let focus_handle = self.focus_handle.clone();
+ let secondary_confirm_tooltip = if self.create_new_window {
+ "Open Project in This Window"
+ } else {
+ "Open Project in New Window"
+ };
+ let primary_confirm_tooltip = if self.create_new_window {
+ "Open Project in New Window"
+ } else {
+ "Open Project in This Window"
+ };
+ let secondary_confirm_icon = if self.create_new_window {
+ IconName::ThisWindow
+ } else {
+ IconName::ArrowUpRight
+ };
let secondary_actions = h_flex()
.gap_px()
@@ -1534,12 +1573,12 @@ impl PickerDelegate for RecentProjectsDelegate {
)
})
.child(
- IconButton::new("open_new_window", IconName::ArrowUpRight)
+ IconButton::new("alternate_open", secondary_confirm_icon)
.icon_size(IconSize::Small)
.tooltip({
move |_, cx| {
Tooltip::for_action_in(
- "Open Project in New Window",
+ secondary_confirm_tooltip,
&menu::SecondaryConfirm,
&focus_handle,
cx,
@@ -1556,7 +1595,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(
IconButton::new("delete", IconName::Close)
.icon_size(IconSize::Small)
- .tooltip(Tooltip::text("Delete from Recent Projects"))
+ .tooltip(Tooltip::text("Remove from Recent Projects"))
.on_click(cx.listener(move |this, _event, window, cx| {
cx.stop_propagation();
window.prevent_default();
@@ -1595,7 +1634,7 @@ impl PickerDelegate for RecentProjectsDelegate {
})
.tooltip(move |_, cx| {
Tooltip::with_meta(
- "Open Project in This Window",
+ primary_confirm_tooltip,
None,
tooltip_path.clone(),
cx,
@@ -1648,7 +1687,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(Label::new("Open Local Folders"))
.child(KeyBinding::for_action_in(
&workspace::Open {
- create_new_window: self.create_new_window,
+ create_new_window: Some(self.create_new_window),
},
&focus_handle,
cx,
@@ -1678,20 +1717,23 @@ impl PickerDelegate for RecentProjectsDelegate {
.child(KeyBinding::for_action(
&OpenRemote {
from_existing_connection: false,
- create_new_window: false,
+ create_new_window: Some(self.create_new_window),
},
cx,
)),
)
- .on_click(|_, window, cx| {
- window.dispatch_action(
- OpenRemote {
- from_existing_connection: false,
- create_new_window: false,
- }
- .boxed_clone(),
- cx,
- )
+ .on_click({
+ let create_new_window = self.create_new_window;
+ move |_, window, cx| {
+ window.dispatch_action(
+ OpenRemote {
+ from_existing_connection: false,
+ create_new_window: Some(create_new_window),
+ }
+ .boxed_clone(),
+ cx,
+ )
+ }
}),
)
.into_any(),
@@ -1735,7 +1777,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.into_any_element(),
),
Some(ProjectPickerEntry::RecentProject(_)) => Some(
- Button::new("delete_recent", "Delete")
+ Button::new("delete_recent", "Remove")
.key_binding(KeyBinding::for_action_in(
&RemoveSelected,
&focus_handle,
@@ -1797,6 +1839,29 @@ impl PickerDelegate for RecentProjectsDelegate {
window.dispatch_action(menu::Confirm.boxed_clone(), cx)
}),
)
+ } else if self.create_new_window {
+ this.child(
+ Button::new("open_here", "This Window")
+ .key_binding(KeyBinding::for_action_in(
+ &menu::SecondaryConfirm,
+ &focus_handle,
+ cx,
+ ))
+ .on_click(|_, window, cx| {
+ window.dispatch_action(menu::SecondaryConfirm.boxed_clone(), cx)
+ }),
+ )
+ .child(
+ Button::new("open_new_window", "Open")
+ .key_binding(KeyBinding::for_action_in(
+ &menu::Confirm,
+ &focus_handle,
+ cx,
+ ))
+ .on_click(|_, window, cx| {
+ window.dispatch_action(menu::Confirm.boxed_clone(), cx)
+ }),
+ )
} else {
this.child(
Button::new("open_new_window", "New Window")
@@ -1844,7 +1909,9 @@ impl PickerDelegate for RecentProjectsDelegate {
let focus_handle = focus_handle.clone();
let workspace_handle = self.workspace.clone();
let create_new_window = self.create_new_window;
- let open_action = workspace::Open { create_new_window };
+ let open_action = workspace::Open {
+ create_new_window: Some(create_new_window),
+ };
let show_add_to_workspace = match selected_entry {
Some(ProjectPickerEntry::RecentProject(hit)) => self
.workspaces
@@ -1892,7 +1959,7 @@ impl PickerDelegate for RecentProjectsDelegate {
"Open Remote Folder",
OpenRemote {
from_existing_connection: false,
- create_new_window: false,
+ create_new_window: Some(create_new_window),
}
.boxed_clone(),
)
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index 7dc53a55a96..c1b0ce24cab 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -987,10 +987,12 @@ impl RemoteServerProjects {
pub fn popover(
fs: Arc<dyn Fs>,
workspace: WeakEntity<Workspace>,
- create_new_window: bool,
+ create_new_window: Option<bool>,
window: &mut Window,
cx: &mut App,
) -> Entity<Self> {
+ let create_new_window =
+ create_new_window.unwrap_or_else(|| crate::default_open_in_new_window(cx));
cx.new(|cx| {
let server = Self::new(create_new_window, fs, window, workspace, cx);
server.focus_handle(cx).focus(window, cx);
diff --git a/crates/recent_projects/src/sidebar_recent_projects.rs b/crates/recent_projects/src/sidebar_recent_projects.rs
index a8726024e84..91b12100296 100644
--- a/crates/recent_projects/src/sidebar_recent_projects.rs
+++ b/crates/recent_projects/src/sidebar_recent_projects.rs
@@ -401,7 +401,7 @@ impl PickerDelegate for SidebarRecentProjectsDelegate {
.border_color(cx.theme().colors().border_variant)
.child({
let open_action = workspace::Open {
- create_new_window: false,
+ create_new_window: Some(false),
};
ButtonLike::new("open_local_folder")
@@ -429,7 +429,7 @@ impl PickerDelegate for SidebarRecentProjectsDelegate {
.child(KeyBinding::for_action(
&OpenRemote {
from_existing_connection: false,
- create_new_window: false,
+ create_new_window: Some(false),
},
cx,
)),
@@ -438,7 +438,7 @@ impl PickerDelegate for SidebarRecentProjectsDelegate {
window.dispatch_action(
OpenRemote {
from_existing_connection: false,
- create_new_window: false,
+ create_new_window: Some(false),
}
.boxed_clone(),
cx,
diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rs
index c2a9ec74c26..83b5c454876 100644
--- a/crates/settings/src/vscode_import.rs
+++ b/crates/settings/src/vscode_import.rs
@@ -1011,6 +1011,7 @@ impl VsCodeSettings {
bottom_dock_layout: None,
centered_layout: None,
cli_default_open_behavior: None,
+ default_open_behavior: None,
close_on_file_delete: None,
close_panel_on_toggle: None,
command_aliases: Default::default(),
diff --git a/crates/settings_content/src/workspace.rs b/crates/settings_content/src/workspace.rs
index fbfcdf210b6..7873b332832 100644
--- a/crates/settings_content/src/workspace.rs
+++ b/crates/settings_content/src/workspace.rs
@@ -54,6 +54,10 @@ pub struct WorkspaceSettingsContent {
///
/// Default: existing_window
pub cli_default_open_behavior: Option<CliDefaultOpenBehavior>,
+ /// The default behavior when opening projects from the UI.
+ ///
+ /// Default: existing_window
+ pub default_open_behavior: Option<DefaultOpenBehavior>,
/// Whether to attempt to restore previous file's state when opening it again.
/// The state is stored per pane.
/// When disabled, defaults are applied instead of the state restoration.
@@ -410,6 +414,31 @@ pub enum CliDefaultOpenBehavior {
NewWindow,
}
+#[derive(
+ Copy,
+ Clone,
+ PartialEq,
+ Eq,
+ Default,
+ Serialize,
+ Deserialize,
+ JsonSchema,
+ MergeFrom,
+ Debug,
+ strum::VariantArray,
+ strum::VariantNames,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum DefaultOpenBehavior {
+ /// Open projects in the current Zed window.
+ #[default]
+ #[strum(serialize = "Add to Existing Window")]
+ ExistingWindow,
+ /// Open projects in a new window.
+ #[strum(serialize = "Open a New Window")]
+ NewWindow,
+}
+
#[derive(
Copy,
Clone,
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 4480d608553..57038d8a6ce 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -257,6 +257,25 @@ fn general_page(cx: &App) -> SettingsPage {
})),
files: USER,
}),
+ SettingsPageItem::SettingItem(SettingItem {
+ title: "Default Open Behavior",
+ description: "How projects open from the UI by default.",
+ field: Box::new(SettingField {
+ organization_override: None,
+ json_path: Some("default_open_behavior"),
+ pick: |settings_content| {
+ settings_content.workspace.default_open_behavior.as_ref()
+ },
+ write: |settings_content, value, _| {
+ settings_content.workspace.default_open_behavior = value;
+ },
+ }),
+ metadata: Some(Box::new(SettingsFieldMetadata {
+ should_do_titlecase: Some(false),
+ ..Default::default()
+ })),
+ files: USER,
+ }),
]
}
fn security_section() -> [SettingsPageItem; 2] {
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index ffff6f4e870..57c284a228e 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -516,6 +516,7 @@ fn init_renderers(cx: &mut App) {
.add_basic_renderer::<settings::BottomDockLayout>(render_dropdown)
.add_basic_renderer::<settings::OnLastWindowClosed>(render_dropdown)
.add_basic_renderer::<settings::CliDefaultOpenBehavior>(render_dropdown)
+ .add_basic_renderer::<settings::DefaultOpenBehavior>(render_dropdown)
.add_basic_renderer::<settings::CloseWindowWhenNoItems>(render_dropdown)
.add_basic_renderer::<settings::TextRenderingMode>(render_dropdown)
.add_basic_renderer::<settings::FontFamilyName>(render_font_picker)
diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs
index 5add7fe1d08..ebd42f38730 100644
--- a/crates/sidebar/src/sidebar.rs
+++ b/crates/sidebar/src/sidebar.rs
@@ -6570,15 +6570,7 @@ impl Sidebar {
IconButton::new("open-project", IconName::OpenFolder)
.icon_size(IconSize::Small)
.selected_style(ButtonStyle::Tinted(TintColor::Accent)),
- |_window, cx| {
- Tooltip::for_action(
- "Add Project",
- &OpenRecent {
- create_new_window: false,
- },
- cx,
- )
- },
+ |_window, cx| Tooltip::for_action("Add Project", &OpenRecent::default(), cx),
)
.offset(gpui::Point {
x: px(-2.0),
@@ -7274,7 +7266,7 @@ impl Sidebar {
telemetry::event!("Sidebar Add Project Clicked", side = side);
window.dispatch_action(
Open {
- create_new_window: false,
+ create_new_window: Some(false),
}
.boxed_clone(),
cx,
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
index 74aa24a9cef..169aa944e18 100644
--- a/crates/title_bar/src/title_bar.rs
+++ b/crates/title_bar/src/title_bar.rs
@@ -630,7 +630,7 @@ impl TitleBar {
Some(recent_projects::RemoteServerProjects::popover(
fs,
workspace.clone(),
- false,
+ None,
window,
cx,
))
@@ -657,10 +657,7 @@ impl TitleBar {
move |_window, cx| {
Tooltip::with_meta(
tooltip_title,
- Some(&OpenRemote {
- from_existing_connection: false,
- create_new_window: false,
- }),
+ Some(&OpenRemote::default()),
meta.clone(),
cx,
)
@@ -816,7 +813,7 @@ impl TitleBar {
Some(recent_projects::RecentProjects::popover(
workspace.clone(),
window_project_groups.clone(),
- false,
+ None,
focus_handle.clone(),
window,
cx,
@@ -835,13 +832,7 @@ impl TitleBar {
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
.when(!is_project_selected, |s| s.color(Color::Muted)),
move |_window, cx| {
- Tooltip::for_action(
- "Recent Projects",
- &zed_actions::OpenRecent {
- create_new_window: false,
- },
- cx,
- )
+ Tooltip::for_action("Recent Projects", &zed_actions::OpenRecent::default(), cx)
},
)
.anchor(gpui::Anchor::TopLeft)
@@ -873,7 +864,7 @@ impl TitleBar {
Some(recent_projects::RecentProjects::popover(
workspace.clone(),
window_project_groups.clone(),
- false,
+ None,
focus_handle.clone(),
window,
cx,
@@ -892,13 +883,7 @@ impl TitleBar {
.selected_style(ButtonStyle::Tinted(TintColor::Accent))
.when(!is_project_selected, |s| s.color(Color::Muted)),
move |_window, cx| {
- Tooltip::for_action(
- "Recent Projects",
- &zed_actions::OpenRecent {
- create_new_window: false,
- },
- cx,
- )
+ Tooltip::for_action("Recent Projects", &zed_actions::OpenRecent::default(), cx)
},
)
.anchor(gpui::Anchor::TopLeft)
diff --git a/crates/workspace/src/welcome.rs b/crates/workspace/src/welcome.rs
index 122cc468a45..1bf0e81f1bd 100644
--- a/crates/workspace/src/welcome.rs
+++ b/crates/workspace/src/welcome.rs
@@ -1,6 +1,6 @@
use crate::{
NewFile, Open, OpenMode, PathList, RecentWorkspace, SerializedWorkspaceLocation,
- ToggleWorkspaceSidebar, Workspace,
+ ToggleWorkspaceSidebar, Workspace, WorkspaceSettings,
item::{Item, ItemEvent},
persistence::WorkspaceDb,
};
@@ -15,7 +15,7 @@ use menu::{SelectNext, SelectPrevious};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
-use settings::Settings;
+use settings::{DefaultOpenBehavior, Settings};
use ui::{ButtonLike, Divider, DividerColor, KeyBinding, Vector, VectorName, prelude::*};
use util::ResultExt;
use zed_actions::{
@@ -307,10 +307,14 @@ impl WelcomePage {
if is_local {
let paths = workspace.paths.paths().to_vec();
+ let open_mode = match WorkspaceSettings::get_global(cx).default_open_behavior {
+ DefaultOpenBehavior::ExistingWindow => OpenMode::Activate,
+ DefaultOpenBehavior::NewWindow => OpenMode::NewWindow,
+ };
self.workspace
.update(cx, |workspace, cx| {
workspace
- .open_workspace_for_paths(OpenMode::Activate, paths, window, cx)
+ .open_workspace_for_paths(open_mode, paths, window, cx)
.detach_and_log_err(cx);
})
.log_err();
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 870060d2ba4..5edc1563711 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -111,7 +111,8 @@ use schemars::JsonSchema;
use serde::Deserialize;
use session::AppSession;
use settings::{
- CenteredPaddingSettings, Settings, SettingsLocation, SettingsStore, update_settings_file,
+ CenteredPaddingSettings, DefaultOpenBehavior, Settings, SettingsLocation, SettingsStore,
+ update_settings_file,
};
use sqlez::{
@@ -225,21 +226,16 @@ pub trait DebuggerProvider {
#[action(namespace = workspace)]
pub struct Open {
/// When true, opens in a new window. When false, adds to the current
- /// window as a new workspace (multi-workspace).
- #[serde(default = "Open::default_create_new_window")]
- pub create_new_window: bool,
+ /// window as a new workspace (multi-workspace). When omitted, uses
+ /// `default_open_behavior`.
+ #[serde(default)]
+ pub create_new_window: Option<bool>,
}
impl Open {
pub const DEFAULT: Self = Self {
- create_new_window: false,
+ create_new_window: None,
};
-
- /// Used by `#[serde(default)]` on the `create_new_window` field so that
- /// the serde default and `Open::DEFAULT` stay in sync.
- fn default_create_new_window() -> bool {
- Self::DEFAULT.create_new_window
- }
}
impl Default for Open {
@@ -786,7 +782,12 @@ pub fn init(app_state: Arc<AppState>, cx: &mut App) {
multiple: true,
prompt: None,
},
- action.create_new_window,
+ action.create_new_window.unwrap_or_else(|| {
+ matches!(
+ WorkspaceSettings::get_global(cx).default_open_behavior,
+ DefaultOpenBehavior::NewWindow
+ )
+ }),
cx,
);
})
diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs
index 53ef067193e..bed95a5f9f8 100644
--- a/crates/workspace/src/workspace_settings.rs
+++ b/crates/workspace/src/workspace_settings.rs
@@ -21,6 +21,7 @@ pub struct WorkspaceSettings {
pub autosave: AutosaveSetting,
pub restore_on_startup: settings::RestoreOnStartupBehavior,
pub cli_default_open_behavior: settings::CliDefaultOpenBehavior,
+ pub default_open_behavior: settings::DefaultOpenBehavior,
pub restore_on_file_reopen: bool,
pub drop_target_size: f32,
pub use_system_path_prompts: bool,
@@ -101,6 +102,7 @@ impl Settings for WorkspaceSettings {
autosave: workspace.autosave.unwrap(),
restore_on_startup: workspace.restore_on_startup.unwrap(),
cli_default_open_behavior: workspace.cli_default_open_behavior.unwrap(),
+ default_open_behavior: workspace.default_open_behavior.unwrap(),
restore_on_file_reopen: workspace.restore_on_file_reopen.unwrap(),
drop_target_size: workspace.drop_target_size.unwrap(),
use_system_path_prompts: workspace.use_system_path_prompts.unwrap(),
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 1b5e00c68d5..9f6c5cd2171 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -65,10 +65,10 @@ use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
use rope::Rope;
use search::project_search::ProjectSearchBar;
use settings::{
- BaseKeymap, DEFAULT_KEYMAP_PATH, InvalidSettingsError, KeybindSource, KeymapFile,
- KeymapFileLoadResult, MigrationStatus, Settings, SettingsFile, SettingsStore, VIM_KEYMAP_PATH,
- initial_local_debug_tasks_content, initial_project_settings_content, initial_tasks_content,
- update_settings_file,
+ BaseKeymap, DEFAULT_KEYMAP_PATH, DefaultOpenBehavior, InvalidSettingsError, KeybindSource,
+ KeymapFile, KeymapFileLoadResult, MigrationStatus, Settings, SettingsFile, SettingsStore,
+ VIM_KEYMAP_PATH, initial_local_debug_tasks_content, initial_project_settings_content,
+ initial_tasks_content, update_settings_file,
};
use sidebar::Sidebar;
#[cfg(debug_assertions)]
@@ -940,7 +940,12 @@ fn register_actions(
multiple: true,
prompt: None,
},
- action.create_new_window,
+ action.create_new_window.unwrap_or_else(|| {
+ matches!(
+ WorkspaceSettings::get_global(cx).default_open_behavior,
+ DefaultOpenBehavior::NewWindow
+ )
+ }),
window,
cx,
);
diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs
index f3913a65566..29a06747f9e 100644
--- a/crates/zed/src/zed/app_menus.rs
+++ b/crates/zed/src/zed/app_menus.rs
@@ -121,19 +121,8 @@ pub fn app_menus(cx: &mut App) -> Vec<Menu> {
},
workspace::Open::default(),
),
- MenuItem::action(
- "Open Recent...",
- zed_actions::OpenRecent {
- create_new_window: false,
- },
- ),
- MenuItem::action(
- "Open Remote...",
- zed_actions::OpenRemote {
- create_new_window: false,
- from_existing_connection: false,
- },
- ),
+ MenuItem::action("Open Recent…", zed_actions::OpenRecent::default()),
+ MenuItem::action("Open Remote…", zed_actions::OpenRemote::default()),
MenuItem::separator(),
MenuItem::action("Add Folder to Project…", workspace::AddFolderToProject),
MenuItem::separator(),
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index 8ff04471dd0..b0ff0a7ae0f 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -620,7 +620,7 @@ pub mod assistant {
#[serde(deny_unknown_fields)]
pub struct OpenRecent {
#[serde(default)]
- pub create_new_window: bool,
+ pub create_new_window: Option<bool>,
}
/// Creates a project from a selected template.
@@ -631,7 +631,7 @@ pub struct OpenRemote {
#[serde(default)]
pub from_existing_connection: bool,
#[serde(default)]
- pub create_new_window: bool,
+ pub create_new_window: Option<bool>,
}
/// Opens the dev container connection modal.
@@ -795,7 +795,7 @@ pub mod wsl_actions {
#[serde(deny_unknown_fields)]
pub struct OpenFolderInWsl {
#[serde(default)]
- pub create_new_window: bool,
+ pub create_new_window: Option<bool>,
}
/// Open a wsl distro.
@@ -804,7 +804,7 @@ pub mod wsl_actions {
#[serde(deny_unknown_fields)]
pub struct OpenWsl {
#[serde(default)]
- pub create_new_window: bool,
+ pub create_new_window: Option<bool>,
}
}