wip

crates/titlebar/src/lib.rs

@@ -1,12 +1,11 @@
-use std::mem;
-
 use gpui::prelude::FluentBuilder;
 #[cfg(target_os = "linux")]
 use gpui::MouseButton;
+#[cfg(not(target_os = "windows"))]
+use gpui::Pixels;
 use gpui::{
-    div, px, AnyElement, Context, Decorations, Hsla, InteractiveElement as _, IntoElement,
-    ParentElement, Pixels, Render, StatefulInteractiveElement as _, Styled, Window,
-    WindowControlArea,
+    px, AnyElement, Context, Decorations, Hsla, InteractiveElement as _, IntoElement,
+    ParentElement, Render, StatefulInteractiveElement as _, Styled, Window, WindowControlArea,
 };
 use smallvec::{smallvec, SmallVec};
 use theme::{ActiveTheme, PlatformKind, CLIENT_SIDE_DECORATION_ROUNDING};
@@ -14,19 +13,18 @@ use ui::h_flex;
 
 #[cfg(target_os = "linux")]
 use crate::platforms::linux::LinuxWindowControls;
+use crate::platforms::mac::TRAFFIC_LIGHT_PADDING;
 use crate::platforms::windows::WindowsWindowControls;
 
 mod platforms;
 
+/// Titlebar
 pub struct TitleBar {
+    /// Children elements of the title bar.
     children: SmallVec<[AnyElement; 2]>,
-    should_move: bool,
-}
 
-impl Default for TitleBar {
-    fn default() -> Self {
-        Self::new()
-    }
+    /// Whether the title bar is currently being moved.
+    should_move: bool,
 }
 
 impl TitleBar {
@@ -38,16 +36,16 @@ impl TitleBar {
     }
 
     #[cfg(not(target_os = "windows"))]
-    pub fn height(window: &mut Window) -> Pixels {
+    pub fn height(&self, window: &mut Window) -> Pixels {
         (1.75 * window.rem_size()).max(px(34.))
     }
 
     #[cfg(target_os = "windows")]
-    pub fn height(_window: &mut Window) -> Pixels {
+    pub fn height(&self, _window: &mut Window) -> Pixels {
         px(32.)
     }
 
-    pub fn title_bar_color(&self, window: &mut Window, cx: &mut Context<Self>) -> Hsla {
+    pub fn titlebar_color(&self, window: &mut Window, cx: &mut Context<Self>) -> Hsla {
         if cfg!(any(target_os = "linux", target_os = "freebsd")) {
             if window.is_window_active() && !self.should_move {
                 cx.theme().titlebar
@@ -67,20 +65,21 @@ impl TitleBar {
     }
 }
 
-impl ParentElement for TitleBar {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements)
+impl Default for TitleBar {
+    fn default() -> Self {
+        Self::new()
     }
 }
 
 impl Render for TitleBar {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let height = self.height(window);
+        let color = self.titlebar_color(window, cx);
+        let children = std::mem::take(&mut self.children);
+
         #[cfg(target_os = "linux")]
         let supported_controls = window.window_controls();
         let decorations = window.window_decorations();
-        let height = Self::height(window);
-        let color = self.title_bar_color(window, cx);
-        let children = mem::take(&mut self.children);
 
         h_flex()
             .window_control_area(WindowControlArea::Drag)
@@ -90,11 +89,7 @@ impl Render for TitleBar {
                 if window.is_fullscreen() {
                     this.px_2()
                 } else if cx.theme().platform.is_mac() {
-                    this.pl(px(platforms::mac::TRAFFIC_LIGHT_PADDING))
-                        .pr_2()
-                        .when(children.len() <= 1, |this| {
-                            this.pr(px(platforms::mac::TRAFFIC_LIGHT_PADDING))
-                        })
+                    this.pr_2().pl(px(TRAFFIC_LIGHT_PADDING))
                 } else {
                     this.px_2()
                 }
@@ -114,11 +109,8 @@ impl Render for TitleBar {
             .border_color(cx.theme().border)
             .content_stretch()
             .child(
-                div()
+                h_flex()
                     .id("title-bar")
-                    .flex()
-                    .flex_row()
-                    .items_center()
                     .justify_between()
                     .w_full()
                     .when(cx.theme().platform.is_mac(), |this| {

crates/titlebar/src/platforms/linux.rs

@@ -25,20 +25,26 @@ impl LinuxWindowControls {
 
 impl RenderOnce for LinuxWindowControls {
     fn render(self, window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let supported_controls = window.window_controls();
+
         h_flex()
             .id("linux-window-controls")
             .gap_2()
             .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-            .child(WindowControl::new(
-                LinuxControl::Minimize,
-                IconName::WindowMinimize,
-            ))
-            .child({
-                if window.is_maximized() {
-                    WindowControl::new(LinuxControl::Restore, IconName::WindowRestore)
-                } else {
-                    WindowControl::new(LinuxControl::Maximize, IconName::WindowMaximize)
-                }
+            .when(supported_controls.minimize, |this| {
+                this.child(WindowControl::new(
+                    LinuxControl::Minimize,
+                    IconName::WindowMinimize,
+                ))
+            })
+            .when(supported_controls.maximize, |this| {
+                this.child({
+                    if window.is_maximized() {
+                        WindowControl::new(LinuxControl::Restore, IconName::WindowRestore)
+                    } else {
+                        WindowControl::new(LinuxControl::Maximize, IconName::WindowMaximize)
+                    }
+                })
             })
             .child(
                 WindowControl::new(LinuxControl::Close, IconName::WindowClose)