feat: change light mode surface color

This commit is contained in:
2026-05-13 17:35:21 +08:00
parent 6d8a7ae5b0
commit cf3c292a17

View File

@@ -52,20 +52,20 @@ impl ThemeFamily {
pub const fn id(self) -> &'static str {
match self {
Self::Catppuccin => "catppuccin",
| Self::Catppuccin => "catppuccin",
}
}
pub const fn label(self) -> &'static str {
match self {
Self::Catppuccin => "Catppuccin",
| Self::Catppuccin => "Catppuccin",
}
}
pub const fn variant(self, mode: ThemeMode) -> ThemeVariant {
match (self, mode) {
(Self::Catppuccin, ThemeMode::Light) => ThemeVariant::CatppuccinLatte,
(Self::Catppuccin, ThemeMode::Dark) => ThemeVariant::CatppuccinMocha,
| (Self::Catppuccin, ThemeMode::Light) => ThemeVariant::CatppuccinLatte,
| (Self::Catppuccin, ThemeMode::Dark) => ThemeVariant::CatppuccinMocha,
}
}
@@ -92,64 +92,64 @@ impl ThemeVariant {
pub const fn family(self) -> ThemeFamily {
match self {
Self::CatppuccinLatte | Self::CatppuccinMocha => ThemeFamily::Catppuccin,
| Self::CatppuccinLatte | Self::CatppuccinMocha => ThemeFamily::Catppuccin,
}
}
pub const fn mode(self) -> ThemeMode {
match self {
Self::CatppuccinLatte => ThemeMode::Light,
Self::CatppuccinMocha => ThemeMode::Dark,
| Self::CatppuccinLatte => ThemeMode::Light,
| Self::CatppuccinMocha => ThemeMode::Dark,
}
}
pub const fn label(self) -> &'static str {
match self {
Self::CatppuccinLatte => "Catppuccin Latte",
Self::CatppuccinMocha => "Catppuccin Mocha",
| Self::CatppuccinLatte => "Catppuccin Latte",
| Self::CatppuccinMocha => "Catppuccin Mocha",
}
}
pub const fn theme(self) -> Theme {
match self {
Self::CatppuccinLatte => Theme {
id: "catppuccin-latte",
name: "Catppuccin Latte",
mode: ThemeMode::Light,
colors: ThemeColors {
background: hex(0xeff1f5),
surface: hex(0xe6e9ef),
surface_elevated: hex(0xdce0e8),
border: hex(0xccd0da),
text: hex(0x4c4f69),
text_muted: hex(0x6c6f85),
accent: hex(0x8839ef),
accent_hover: hex(0x7287fd),
accent_text: hex(0xeff1f5),
success: hex(0x40a02b),
warning: hex(0xdf8e1d),
danger: hex(0xd20f39),
},
| Self::CatppuccinLatte => Theme {
id: "catppuccin-latte",
name: "Catppuccin Latte",
mode: ThemeMode::Light,
colors: ThemeColors {
background: hex(0xeff1f5),
surface: hex(0xeff1f5),
surface_elevated: hex(0xdce0e8),
border: hex(0xccd0da),
text: hex(0x4c4f69),
text_muted: hex(0x6c6f85),
accent: hex(0x8839ef),
accent_hover: hex(0x7287fd),
accent_text: hex(0xeff1f5),
success: hex(0x40a02b),
warning: hex(0xdf8e1d),
danger: hex(0xd20f39),
},
Self::CatppuccinMocha => Theme {
id: "catppuccin-mocha",
name: "Catppuccin Mocha",
mode: ThemeMode::Dark,
colors: ThemeColors {
background: hex(0x1e1e2e),
surface: hex(0x181825),
surface_elevated: hex(0x313244),
border: hex(0x45475a),
text: hex(0xcdd6f4),
text_muted: hex(0xa6adc8),
accent: hex(0xcba6f7),
accent_hover: hex(0xb4befe),
accent_text: hex(0x1e1e2e),
success: hex(0xa6e3a1),
warning: hex(0xf9e2af),
danger: hex(0xf38ba8),
},
},
| Self::CatppuccinMocha => Theme {
id: "catppuccin-mocha",
name: "Catppuccin Mocha",
mode: ThemeMode::Dark,
colors: ThemeColors {
background: hex(0x1e1e2e),
surface: hex(0x181825),
surface_elevated: hex(0x313244),
border: hex(0x45475a),
text: hex(0xcdd6f4),
text_muted: hex(0xa6adc8),
accent: hex(0xcba6f7),
accent_hover: hex(0xb4befe),
accent_text: hex(0x1e1e2e),
success: hex(0xa6e3a1),
warning: hex(0xf9e2af),
danger: hex(0xf38ba8),
},
},
}
}
}
@@ -157,10 +157,8 @@ impl ThemeVariant {
impl From<gpui::WindowAppearance> for ThemeMode {
fn from(value: gpui::WindowAppearance) -> Self {
match value {
gpui::WindowAppearance::Light | gpui::WindowAppearance::VibrantLight => {
ThemeMode::Light
}
gpui::WindowAppearance::Dark | gpui::WindowAppearance::VibrantDark => ThemeMode::Dark,
| gpui::WindowAppearance::Light | gpui::WindowAppearance::VibrantLight => ThemeMode::Light,
| gpui::WindowAppearance::Dark | gpui::WindowAppearance::VibrantDark => ThemeMode::Dark,
}
}
}