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.

settings_ui: Respect window decorations setting (#57371)

hollmmax0ec218fa5fde
diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs
index 02bbacdfa30..5f9d323746e 100644
--- a/crates/settings_ui/src/settings_ui.rs
+++ b/crates/settings_ui/src/settings_ui.rs
@@ -42,7 +42,8 @@ use ui::{
use util::{ResultExt as _, paths::PathStyle, rel_path::RelPath};
use workspace::{
- AppState, MultiWorkspace, OpenOptions, OpenVisible, Workspace, client_side_decorations,
+ AppState, MultiWorkspace, OpenOptions, OpenVisible, Workspace, WorkspaceSettings,
+ client_side_decorations,
};
use zed_actions::{OpenProjectSettings, OpenSettings, OpenSettingsAt};
@@ -662,7 +663,10 @@ pub fn open_settings_editor(
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,
- _ => gpui::WindowDecorations::Client,
+ _ => match WorkspaceSettings::get_global(cx).window_decorations {
+ settings::WindowDecorations::Server => gpui::WindowDecorations::Server,
+ settings::WindowDecorations::Client => gpui::WindowDecorations::Client,
+ },
};
cx.open_window(