Merge remote-tracking branch 'origin/main' into new-view-new-model-rename

2024-01-01 17:42:12 -07:00
parent db1cf8f6e1 789db30c42
commit 47071605a1
44 changed files with 166 additions and 148 deletions
@@ -2757,7 +2757,7 @@ enum Invisible {
 impl Element for EditorElement {
    type State = ();

-    fn layout(
+    fn request_layout(
        &mut self,
        _element_state: Option<Self::State>,
        cx: &mut gpui::WindowContext,