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

This commit is contained in:
Nathan Sobo
2024-01-01 17:42:12 -07:00
44 changed files with 166 additions and 148 deletions
+1 -1
View File
@@ -773,7 +773,7 @@ mod element {
impl Element for PaneAxisElement {
type State = Rc<RefCell<Option<usize>>>;
fn layout(
fn request_layout(
&mut self,
state: Option<Self::State>,
cx: &mut ui::prelude::WindowContext,
+1 -1
View File
@@ -4283,7 +4283,7 @@ struct DisconnectedOverlay;
impl Element for DisconnectedOverlay {
type State = AnyElement;
fn layout(
fn request_layout(
&mut self,
_: Option<Self::State>,
cx: &mut WindowContext,