wip

crates/theme/src/colors.rs

@@ -106,7 +106,7 @@ impl ThemeColors {
             background: neutral().light().step_1(),
             surface_background: neutral().light().step_2(),
             elevated_surface_background: neutral().light().step_3(),
-            panel_background: gpui::white(),
+            panel_background: neutral().light().step_4(),
             overlay: neutral().light_alpha().step_3(),
             title_bar: gpui::transparent_black(),
             title_bar_inactive: neutral().light().step_1(),
@@ -164,9 +164,9 @@ impl ThemeColors {
             ghost_element_selected: neutral().light().step_5(),
             ghost_element_disabled: neutral().light_alpha().step_2(),
 
-            tab_inactive_background: neutral().light().step_3(),
-            tab_hover_background: neutral().light().step_4(),
-            tab_active_background: neutral().light().step_5(),
+            tab_inactive_background: neutral().light().step_2(),
+            tab_hover_background: neutral().light().step_3(),
+            tab_active_background: neutral().light().step_4(),
 
             scrollbar_thumb_background: neutral().light_alpha().step_3(),
             scrollbar_thumb_hover_background: neutral().light_alpha().step_4(),
@@ -188,7 +188,7 @@ impl ThemeColors {
             background: neutral().dark().step_1(),
             surface_background: neutral().dark().step_2(),
             elevated_surface_background: neutral().dark().step_3(),
-            panel_background: gpui::black(),
+            panel_background: neutral().dark().step_4(),
             overlay: neutral().dark_alpha().step_3(),
             title_bar: gpui::transparent_black(),
             title_bar_inactive: neutral().dark().step_1(),
@@ -246,9 +246,9 @@ impl ThemeColors {
             ghost_element_selected: neutral().dark().step_5(),
             ghost_element_disabled: neutral().dark_alpha().step_2(),
 
-            tab_inactive_background: neutral().dark().step_3(),
-            tab_hover_background: neutral().dark().step_4(),
-            tab_active_background: neutral().dark().step_5(),
+            tab_inactive_background: neutral().dark().step_2(),
+            tab_hover_background: neutral().dark().step_3(),
+            tab_active_background: neutral().dark().step_4(),
 
             scrollbar_thumb_background: neutral().dark_alpha().step_3(),
             scrollbar_thumb_hover_background: neutral().dark_alpha().step_4(),

crates/theme/src/lib.rs

@@ -4,12 +4,14 @@ use std::rc::Rc;
 use gpui::{px, App, Global, Pixels, SharedString, Window};
 
 mod colors;
+mod platform_kind;
 mod registry;
 mod scale;
 mod scrollbar_mode;
 mod theme;
 
 pub use colors::*;
+pub use platform_kind::PlatformKind;
 pub use registry::*;
 pub use scale::*;
 pub use scrollbar_mode::*;
@@ -24,6 +26,9 @@ pub const CLIENT_SIDE_DECORATION_SHADOW: Pixels = px(10.0);
 /// Defines window border size for platforms that use client side decorations.
 pub const CLIENT_SIDE_DECORATION_BORDER: Pixels = px(1.0);
 
+/// Defines window titlebar height
+pub const TITLEBAR_HEIGHT: Pixels = px(36.0);
+
 pub fn init(cx: &mut App) {
     registry::init(cx);
 
@@ -70,6 +75,9 @@ pub struct Theme {
 
     /// Show the scrollbar mode, default: scrolling
     pub scrollbar_mode: ScrollbarMode,
+
+    /// Platform
+    pub platform: PlatformKind,
 }
 
 impl Deref for Theme {
@@ -167,7 +175,9 @@ impl Theme {
 
 impl From<ThemeFamily> for Theme {
     fn from(family: ThemeFamily) -> Self {
+        let platform = PlatformKind::platform();
         let mode = ThemeMode::default();
+
         // Define the theme colors based on the appearance
         let colors = match mode {
             ThemeMode::Light => family.light(),
@@ -184,6 +194,7 @@ impl From<ThemeFamily> for Theme {
             mode,
             colors: *colors,
             theme: Rc::new(family),
+            platform,
         }
     }
 }

crates/theme/src/platform_kind.rs

@@ -0,0 +1,33 @@
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
+pub enum PlatformKind {
+    Mac,
+    Linux,
+    Windows,
+}
+
+impl PlatformKind {
+    pub const fn platform() -> Self {
+        if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+            Self::Linux
+        } else if cfg!(target_os = "windows") {
+            Self::Windows
+        } else {
+            Self::Mac
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn is_linux(&self) -> bool {
+        matches!(self, Self::Linux)
+    }
+
+    #[allow(dead_code)]
+    pub fn is_windows(&self) -> bool {
+        matches!(self, Self::Windows)
+    }
+
+    #[allow(dead_code)]
+    pub fn is_mac(&self) -> bool {
+        matches!(self, Self::Mac)
+    }
+}