diff --git a/Cargo.lock b/Cargo.lock index 152dbd8e603ad18b28add0aee4ad1e652f7daaf3..863f8d62bcd07af765a53b38dd1ec31604f5ad9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15334,6 +15334,7 @@ dependencies = [ "picker", "pretty_assertions", "project", + "release_channel", "schemars 1.0.4", "search", "serde", diff --git a/crates/settings_ui/Cargo.toml b/crates/settings_ui/Cargo.toml index b2b40bf250c18fc63ed737cd80110f0a9fd83d6d..bbb1cb397b5a806bdbc5ff29b4954f1996ca32a5 100644 --- a/crates/settings_ui/Cargo.toml +++ b/crates/settings_ui/Cargo.toml @@ -28,6 +28,7 @@ menu.workspace = true paths.workspace = true picker.workspace = true project.workspace = true +release_channel.workspace = true schemars.workspace = true search.workspace = true serde.workspace = true diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index c08e00ffbe483846106e1f2de2b86de5c1bb5eb9..48d0bfc5c86efea24dd83c1d9b2c0ddecb56c253 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -13,6 +13,7 @@ use gpui::{ }; use heck::ToTitleCase as _; use project::{Project, WorktreeId}; +use release_channel::ReleaseChannel; use schemars::JsonSchema; use serde::Deserialize; use settings::{Settings, SettingsContent, SettingsStore}; @@ -579,6 +580,7 @@ pub fn open_settings_editor( let scale_factor = current_rem_size / default_rem_size; let scaled_bounds: gpui::Size = default_bounds.map(|axis| axis * scale_factor); + let app_id = ReleaseChannel::global(cx).app_id(); let window_decorations = match std::env::var("ZED_WINDOW_DECORATIONS") { Ok(val) if val == "server" => gpui::WindowDecorations::Server, Ok(val) if val == "client" => gpui::WindowDecorations::Client, @@ -597,6 +599,7 @@ pub fn open_settings_editor( is_movable: true, kind: gpui::WindowKind::Floating, window_background: cx.theme().window_background_appearance(), + app_id: Some(app_id.to_owned()), window_decorations: Some(window_decorations), window_min_size: Some(scaled_bounds), window_bounds: Some(WindowBounds::centered(scaled_bounds, cx)),