merged previous stuffs on master

crates/title_bar/src/lib.rs

@@ -9,15 +9,13 @@ use gpui::{
     WindowControlArea,
 };
 use smallvec::{smallvec, SmallVec};
-use theme::{ActiveTheme, CLIENT_SIDE_DECORATION_ROUNDING};
+use theme::{ActiveTheme, PlatformKind, CLIENT_SIDE_DECORATION_ROUNDING};
 use ui::h_flex;
 
-use crate::platform_kind::PlatformKind;
 #[cfg(target_os = "linux")]
 use crate::platforms::linux::LinuxWindowControls;
 use crate::platforms::windows::WindowsWindowControls;
 
-mod platform_kind;
 mod platforms;
 
 pub struct TitleBar {

crates/title_bar/src/platform_kind.rs

@@ -1,33 +0,0 @@
-#[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)
-    }
-}