Merge remote-tracking branch 'origin/main' into perf-2

2023-12-14 16:56:36 -07:00
parent d13a21c238 139fe7c1f1
commit 02606d1fb9
34 changed files with 822 additions and 1270 deletions
@@ -9297,7 +9297,7 @@ impl Render for Editor {
        let settings = ThemeSettings::get_global(cx);
        let text_style = match self.mode {
            EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {
-                color: cx.theme().colors().text,
+                color: cx.theme().colors().editor_foreground,
                font_family: settings.ui_font.family.clone(),
                font_features: settings.ui_font.features,
                font_size: rems(0.875).into(),
@@ -9310,7 +9310,7 @@ impl Render for Editor {
            },

            EditorMode::Full => TextStyle {
-                color: cx.theme().colors().text,
+                color: cx.theme().colors().editor_foreground,
                font_family: settings.buffer_font.family.clone(),
                font_features: settings.buffer_font.features,
                font_size: settings.buffer_font_size(cx).into(),