Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

settings_ui: Fix switching icon themes from "dynamic" to "static" always selecting the dark theme (#54647)

galuis1167dfe0fb3a4f4
diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index 5b43d0a1842..99dd77b84ae 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -622,7 +622,7 @@ fn appearance_page() -> SettingsPage {
.as_ref()?
.discriminant() as usize])
},
- write: |settings_content, value, _| {
+ write: |settings_content, value, app| {
let Some(value) = value else {
settings_content.theme.icon_theme = None;
return;
@@ -638,7 +638,13 @@ fn appearance_page() -> SettingsPage {
match mode {
theme_settings::ThemeAppearanceMode::Light => light.clone(),
theme_settings::ThemeAppearanceMode::Dark => dark.clone(),
- theme_settings::ThemeAppearanceMode::System => dark.clone(), // no cx, can't determine correct choice
+ theme_settings::ThemeAppearanceMode::System => {
+ if SystemAppearance::global(app).is_light() {
+ light.clone()
+ } else {
+ dark.clone()
+ }
+ }
}
},
};