Add support for specifying both light and dark themes in settings.json (#7404)

This PR adds support for configuring both a light and dark theme in
`settings.json`.

In addition to accepting just a theme name, the `theme` field now also
accepts an object in the following form:

```jsonc
{
  "theme": {
    "mode": "system",
    "light": "One Light",
    "dark": "One Dark"
  }
}
```

Both `light` and `dark` are required, and indicate which theme should be
used when the system is in light mode and dark mode, respectively.

The `mode` field is optional and indicates which theme should be used:
- `"system"` - Use the theme that corresponds to the system's
appearance.
- `"light"` - Use the theme indicated by the `light` field.
- `"dark"` - Use the theme indicated by the `dark` field.

Thank you to @Yesterday17 for taking a first stab at this in #6881!

Release Notes:

- Added support for configuring both a light and dark theme and
switching between them based on system preference.
This commit is contained in:
Marshall Bowers 2024-02-05 15:39:01 -05:00 committed by GitHub
parent b59f925933
commit a80a3b8706
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 167 additions and 24 deletions

View file

@ -64,7 +64,7 @@ use std::{
sync::{atomic::AtomicUsize, Arc},
time::Duration,
};
use theme::{ActiveTheme, ThemeSettings};
use theme::{ActiveTheme, SystemAppearance, ThemeSettings};
pub use toolbar::{Toolbar, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
pub use ui;
use ui::Label;
@ -682,6 +682,21 @@ impl Workspace {
}
cx.notify();
}),
cx.observe_window_appearance(|_, cx| {
let window_appearance = cx.appearance();
*SystemAppearance::global_mut(cx) = SystemAppearance(window_appearance.into());
let mut theme_settings = ThemeSettings::get_global(cx).clone();
if let Some(theme_selection) = theme_settings.theme_selection.clone() {
let theme_name = theme_selection.theme(window_appearance.into());
if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
ThemeSettings::override_global(theme_settings, cx);
}
}
}),
cx.observe(&left_dock, |this, _, cx| {
this.serialize_workspace(cx);
cx.notify();
@ -840,6 +855,8 @@ impl Workspace {
let workspace_id = workspace_id.clone();
let project_handle = project_handle.clone();
move |cx| {
SystemAppearance::init_for_window(cx);
cx.new_view(|cx| {
Workspace::new(workspace_id, project_handle, app_state, cx)
})