Linux: query dconf for CSD position (left/right)

Be-ing · Be-ing · commit 63156218b615 · 2025-10-02T12:52:03.000-05:00
Instead of making users specify their preference for Zed in settings.json, read the system preference. Fixes #14120
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/settings/src/settings_content.rs b/crates/settings/src/settings_content.rs
@@ -234,23 +234,6 @@ pub enum BaseKeymapContent {
     None,
 }
 
-/// Position of window control buttons on Linux.
-///
-/// Valid values: "left" or "right"
-/// - "left": Window controls on the left side (macOS style)
-/// - "right": Window controls on the right side (Windows style)
-#[derive(
-    Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq, Eq, Default,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum WindowControlsPosition {
-    /// Window controls on the left side (macOS style)
-    Left,
-    /// Window controls on the right side (Windows style)
-    #[default]
-    Right,
-}
-
 #[skip_serializing_none]
 #[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)]
 pub struct TitleBarSettingsContent {
@@ -282,10 +265,6 @@ pub struct TitleBarSettingsContent {
     ///
     /// Default: false
     pub show_menus: Option<bool>,
-    /// Position of window control buttons (minimize, maximize, close) on Linux.
-    ///
-    /// Default: right
-    pub window_controls_position: Option<WindowControlsPosition>,
 }
 
 /// Configuration of audio in Zed.
diff --git a/crates/title_bar/Cargo.toml b/crates/title_bar/Cargo.toml
@@ -55,6 +55,9 @@ workspace-hack.workspace = true
 [target.'cfg(windows)'.dependencies]
 windows.workspace = true
 
+[target.'cfg(target_os = "linux")'.dependencies]
+dconf = "0.1.1"
+
 [dev-dependencies]
 call = { workspace = true, features = ["test-support"] }
 client = { workspace = true, features = ["test-support"] }
diff --git a/crates/title_bar/src/platform_title_bar.rs b/crates/title_bar/src/platform_title_bar.rs
@@ -1,9 +1,8 @@
-use crate::title_bar_settings::TitleBarSettings;
+use crate::WindowControlsPosition;
 use gpui::{
     AnyElement, Context, Decorations, Entity, Hsla, InteractiveElement, IntoElement, MouseButton,
     ParentElement, Pixels, StatefulInteractiveElement, Styled, Window, WindowControlArea, div, px,
 };
-use settings::{Settings, WindowControlsPosition};
 use smallvec::SmallVec;
 use std::mem;
 use ui::prelude::*;
@@ -19,19 +18,37 @@ pub struct PlatformTitleBar {
     children: SmallVec<[AnyElement; 2]>,
     should_move: bool,
     system_window_tabs: Entity<SystemWindowTabs>,
+    window_controls_position: WindowControlsPosition,
 }
 
 impl PlatformTitleBar {
     pub fn new(id: impl Into<ElementId>, cx: &mut Context<Self>) -> Self {
         let platform_style = PlatformStyle::platform();
         let system_window_tabs = cx.new(|_cx| SystemWindowTabs::new());
+        let window_controls_position = if cfg!(target_os = "linux") {
+            if let Ok(Some(value)) =
+                dconf::read_string("/org/gnome/desktop/wm/preferences/button-layout")
+            {
+                // This is the value that GNOME Tweaks sets when setting window button position to left.
+                if value == "close,minimize,maximize:icon" {
+                    WindowControlsPosition::Left
+                } else {
+                    WindowControlsPosition::Right
+                }
+            } else {
+                WindowControlsPosition::Right
+            }
+        } else {
+            WindowControlsPosition::Right
+        };
 
         Self {
             id: id.into(),
             platform_style,
             children: SmallVec::new(),
             should_move: false,
             system_window_tabs,
+            window_controls_position,
         }
     }
 
@@ -112,8 +129,7 @@ impl Render for PlatformTitleBar {
                     .items_center()
                     .map(|this| {
                         if self.platform_style == PlatformStyle::Linux {
-                            let title_bar_settings = TitleBarSettings::get(None, cx);
-                            match title_bar_settings.window_controls_position {
+                            match self.window_controls_position {
                                 WindowControlsPosition::Left => this.justify_start(),
                                 WindowControlsPosition::Right => this.justify_between(),
                             }
@@ -144,15 +160,15 @@ impl Render for PlatformTitleBar {
                     PlatformStyle::Mac => title_bar,
                     PlatformStyle::Linux => {
                         if matches!(decorations, Decorations::Client { .. }) {
-                            let title_bar_settings = TitleBarSettings::get(None, cx);
-                            match title_bar_settings.window_controls_position {
+                            match self.window_controls_position {
                                 WindowControlsPosition::Left => {
                                     // macOS style: controls at the beginning of the title bar
                                     h_flex()
                                         .w_full()
                                         .bg(titlebar_color)
                                         .child(platform_linux::LinuxWindowControls::new(
                                             close_action,
+                                            WindowControlsPosition::Left,
                                         ))
                                         .child(title_bar)
                                         .when(supported_controls.window_menu, |titlebar| {
@@ -192,6 +208,7 @@ impl Render for PlatformTitleBar {
                                     title_bar
                                         .child(platform_linux::LinuxWindowControls::new(
                                             close_action,
+                                            WindowControlsPosition::Right,
                                         ))
                                         .when(supported_controls.window_menu, |titlebar| {
                                             titlebar.on_mouse_down(
diff --git a/crates/title_bar/src/platforms/platform_linux.rs b/crates/title_bar/src/platforms/platform_linux.rs
@@ -1,27 +1,31 @@
-use crate::title_bar_settings::TitleBarSettings;
+use crate::WindowControlsPosition;
 use gpui::{Action, Hsla, MouseButton, prelude::*, svg};
-use settings::{Settings, WindowControlsPosition};
 use ui::prelude::*;
 
 #[derive(IntoElement)]
 pub struct LinuxWindowControls {
     close_window_action: Box<dyn Action>,
+    window_controls_position: WindowControlsPosition,
 }
 
 impl LinuxWindowControls {
-    pub fn new(close_window_action: Box<dyn Action>) -> Self {
+    pub fn new(
+        close_window_action: Box<dyn Action>,
+        window_controls_position: WindowControlsPosition,
+    ) -> Self {
         Self {
             close_window_action,
+            window_controls_position,
         }
     }
 }
 
 impl LinuxWindowControls {
     /// Builds the window controls based on the position setting.
     fn build_controls(
-        position: WindowControlsPosition,
         window: &Window,
         close_action: Box<dyn Action>,
+        window_controls_position: WindowControlsPosition,
         cx: &mut App,
     ) -> Vec<WindowControl> {
         let maximize_type = if window.is_maximized() {
@@ -30,7 +34,7 @@ impl LinuxWindowControls {
             WindowControlType::Maximize
         };
 
-        match position {
+        match window_controls_position {
             WindowControlsPosition::Left => {
                 // Left side: Close, Minimize, Maximize (left to right)
                 vec![
@@ -53,11 +57,10 @@ impl LinuxWindowControls {
 
 impl RenderOnce for LinuxWindowControls {
     fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let title_bar_settings = TitleBarSettings::get(None, cx);
         let controls = Self::build_controls(
-            title_bar_settings.window_controls_position,
             window,
             self.close_window_action,
+            self.window_controls_position,
             cx,
         );
 
diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs
@@ -65,6 +65,11 @@ actions!(
     ]
 );
 
+pub(crate) enum WindowControlsPosition {
+    Left,
+    Right,
+}
+
 pub fn init(cx: &mut App) {
     TitleBarSettings::register(cx);
     SystemWindowTabs::init(cx);
diff --git a/crates/title_bar/src/title_bar_settings.rs b/crates/title_bar/src/title_bar_settings.rs
@@ -1,4 +1,4 @@
-use settings::{Settings, SettingsContent, WindowControlsPosition};
+use settings::{Settings, SettingsContent};
 use ui::App;
 
 #[derive(Copy, Clone, Debug)]
@@ -10,7 +10,6 @@ pub struct TitleBarSettings {
     pub show_project_items: bool,
     pub show_sign_in: bool,
     pub show_menus: bool,
-    pub window_controls_position: WindowControlsPosition,
 }
 
 impl Settings for TitleBarSettings {
@@ -24,7 +23,6 @@ impl Settings for TitleBarSettings {
             show_project_items: content.show_project_items.unwrap(),
             show_sign_in: content.show_sign_in.unwrap(),
             show_menus: content.show_menus.unwrap(),
-            window_controls_position: content.window_controls_position.unwrap_or_default(),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use settings::{Settings, SettingsContent, WindowControlsPosition};`
	`1`	`+use settings::{Settings, SettingsContent};`
`2`	`2`	`use ui::App;`
`3`	`3`
`4`	`4`	`#[derive(Copy, Clone, Debug)]`
`@@ -10,7 +10,6 @@ pub struct TitleBarSettings {`
`10`	`10`	`pub show_project_items: bool,`
`11`	`11`	`pub show_sign_in: bool,`
`12`	`12`	`pub show_menus: bool,`
`13`		`- pub window_controls_position: WindowControlsPosition,`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`impl Settings for TitleBarSettings {`
`@@ -24,7 +23,6 @@ impl Settings for TitleBarSettings {`
`24`	`23`	`show_project_items: content.show_project_items.unwrap(),`
`25`	`24`	`show_sign_in: content.show_sign_in.unwrap(),`
`26`	`25`	`show_menus: content.show_menus.unwrap(),`
`27`		`- window_controls_position: content.window_controls_position.unwrap_or_default(),`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`	`}`