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

Merge branch 'main' into go-to-line2

Browse source
This commit is contained in:
Mikayla 2023-11-08 11:32:36 -08:00
commit 409e17ad30
No known key found for this signature in database
71 changed files with 7160 additions and 5833 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/workspace2/src/modal_layer.rs
View file

@ -1,12 +1,10 @@
use std::{any::TypeId, sync::Arc};
use gpui::{
div, px, AnyView, AppContext, Component, DispatchPhase, Div, ParentElement, Render,
StatelessInteractive, Styled, View, ViewContext,
};
use ui::v_stack;
use crate::Workspace;
use gpui::{
div, px, AnyView, AppContext, Component, Div, ParentElement, Render, StatelessInteractive,
Styled, View, ViewContext,
};
use std::{any::TypeId, sync::Arc};
use ui::v_stack;
pub struct ModalRegistry {
registered_modals: Vec<(TypeId, Box<dyn Fn(Div<Workspace>) -> Div<Workspace>>)>,
@ -43,14 +41,7 @@ impl ModalRegistry {
let build_view = build_view.clone();
div.on_action(
move |workspace: &mut Workspace,
event: &A,
phase: DispatchPhase,
cx: &mut ViewContext<Workspace>| {
if phase == DispatchPhase::Capture {
return;
}
move |workspace: &mut Workspace, event: &A, cx: &mut ViewContext<Workspace>| {
let Some(new_modal) = (build_view)(workspace, cx) else {
return;
};