Load themes from settings and rework Settings trait

2023-10-25 20:37:55 +02:00
parent 98e2490807
commit e67048ee7b
19 changed files with 114 additions and 86 deletions
@@ -219,5 +219,5 @@ pub fn old_theme(cx: &WindowContext) -> Arc<Theme> {
 }

 pub fn theme(cx: &WindowContext) -> Arc<theme2::Theme> {
-    cx.global::<Arc<theme2::Theme>>().clone()
+    theme2::active_theme(cx).clone()
 }