Merge branch 'main' into reconnections-2

2022-12-02 19:09:33 +01:00 · 2022-12-02 19:09:33 +01:00 · 969c314315
commit 969c314315
parent 568de814aa ea03b48243
78 changed files with 2759 additions and 1281 deletions
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@ -2784,6 +2784,7 @@ impl View for Workspace {
                                                        &theme,
                                                        &self.follower_states_by_leader,
                                                        self.active_call(),
+                                                        self.active_pane(),
                                                        cx,
                                                    ))
                                                    .flex(1., true)