Merge remote-tracking branch 'origin/main' into editor2-paint

2023-11-07 13:09:48 +01:00 · 2023-11-07 13:09:48 +01:00 · bdf6e8bcc7
commit bdf6e8bcc7
parent 6ae09634ce 2afeb50c4b
204 changed files with 48828 additions and 1648 deletions
--- a/crates/editor2/src/editor.rs
+++ b/crates/editor2/src/editor.rs
@ -9335,7 +9335,7 @@ impl Render for Editor {
            underline: None,
        };
        EditorElement::new(EditorStyle {
-            background: cx.theme().colors().editor,
+            background: cx.theme().colors().editor_background,
            local_player: cx.theme().players().local(),
            text: text_style,
            line_height_scalar: settings.buffer_line_height.value(),