Merge remote-tracking branch 'origin/main' into new-view-new-model-rename
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user