Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that new view observers are called by WindowContext::replace_root_view

Browse source
This commit is contained in:
Max Brunsfeld 2023-12-19 17:04:42 -08:00
parent 71d17e268d
commit c81e89a4f4
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/gpui2/src/window.rs
View file

@ -1926,14 +1926,9 @@ impl VisualContext for WindowContext<'_> {
where where
V: 'static + Render, V: 'static + Render,
{ {
let slot = self.app.entities.reserve(); let view = self.build_view(build_view);
let view = View {
model: slot.clone(),
};
let mut cx = ViewContext::new(&mut *self.app, &mut *self.window, &view);
let entity = build_view(&mut cx);
self.entities.insert(slot, entity);
self.window.root_view = Some(view.clone().into()); self.window.root_view = Some(view.clone().into());
self.notify();
view view
} }

5
crates/workspace2/src/workspace2.rs
View file

@ -600,11 +600,6 @@ impl Workspace {
let modal_layer = cx.build_view(|_| ModalLayer::new()); let modal_layer = cx.build_view(|_| ModalLayer::new());
// todo!()
// cx.update_default_global::<DragAndDrop<Workspace>, _, _>(|drag_and_drop, _| {
// drag_and_drop.register_container(weak_handle.clone());
// });
let mut active_call = None; let mut active_call = None;
if cx.has_global::<Model<ActiveCall>>() { if cx.has_global::<Model<ActiveCall>>() {
let call = cx.global::<Model<ActiveCall>>().clone(); let call = cx.global::<Model<ActiveCall>>().clone();