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

Refactor to make ModalLayer a View

Browse source
This commit is contained in:
Conrad Irwin 2023-11-09 22:11:11 -07:00
parent d4b1d1b528
commit 5a711886d4
3 changed files with 162 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -550,7 +550,7 @@ pub struct Workspace {
last_active_center_pane: Option<WeakView<Pane>>,
last_active_view_id: Option<proto::ViewId>,
status_bar: View<StatusBar>,
modal_layer: ModalLayer,
modal_layer: View<ModalLayer>,
// titlebar_item: Option<AnyViewHandle>,
notifications: Vec<(TypeId, usize, Box<dyn NotificationHandle>)>,
project: Model<Project>,
@ -702,7 +702,7 @@ impl Workspace {
});
let workspace_handle = cx.view().downgrade();
let modal_layer = ModalLayer::new();
let modal_layer = cx.build_view(|cx| ModalLayer::new());
// todo!()
// cx.update_default_global::<DragAndDrop<Workspace>, _, _>(|drag_and_drop, _| {
@ -3526,7 +3526,8 @@ impl Workspace {
where
B: FnOnce(&mut ViewContext<V>) -> V,
{
self.modal_layer.toggle_modal(cx, build)
self.modal_layer
.update(cx, |modal_layer, cx| modal_layer.toggle_modal(cx, build))
}
}
@ -3768,7 +3769,7 @@ impl Render for Workspace {
.border_t()
.border_b()
.border_color(cx.theme().colors().border)
.child(self.modal_layer.wrapper_element(cx))
.child(self.modal_layer.clone())
// .children(
// Some(
// Panel::new("project-panel-outer", cx)