Merge remote-tracking branch 'origin/main' into gpui2-no-send

2023-11-01 21:10:31 -06:00
parent 57dfc50687 72d060108d
commit db9ccd7f34
133 changed files with 14910 additions and 7230 deletions
@@ -90,8 +90,6 @@ impl<V: 'static> PaneGroup<V> {
    }

    fn render(self, view: &mut V, cx: &mut ViewContext<V>) -> impl Component<V> {
-        let theme = theme(cx);
-
        if !self.panes.is_empty() {
            let el = div()
                .flex()
@@ -115,7 +113,7 @@ impl<V: 'static> PaneGroup<V> {
                .gap_px()
                .w_full()
                .h_full()
-                .bg(theme.editor)
+                .bg(cx.theme().colors().editor)
                .children(self.groups.into_iter().map(|group| group.render(view, cx)));

            if self.split_direction == SplitDirection::Horizontal {