Merge branch 'main' into ime-support-2

2022-07-25 10:47:49 +02:00 · 2022-07-25 10:47:49 +02:00 · ca3e73106c
commit ca3e73106c
parent d3567e381c 8c1d4d877f
32 changed files with 2520 additions and 1790 deletions
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@ -1224,8 +1224,10 @@ impl Workspace {
        }
    }

-    pub fn modal(&self) -> Option<&AnyViewHandle> {
-        self.modal.as_ref()
+    pub fn modal<V: 'static + View>(&self) -> Option<ViewHandle<V>> {
+        self.modal
+            .as_ref()
+            .and_then(|modal| modal.clone().downcast::<V>())
    }

    pub fn dismiss_modal(&mut self, cx: &mut ViewContext<Self>) {