zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-01 09:21:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set up menu handler in App::new

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-04-12 14:25:00 -07:00
parent 2332b7e06b
commit 41358f34e3
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gpui/src/app.rs
View File

@ -128,9 +128,16 @@ impl App {
let foreground = Rc::new(executor::Foreground::platform(platform.dispatcher())?); let foreground = Rc::new(executor::Foreground::platform(platform.dispatcher())?);
let app = Self(Rc::new(RefCell::new(MutableAppContext::new( let app = Self(Rc::new(RefCell::new(MutableAppContext::new(
foreground, foreground,
platform, platform.clone(),
asset_source, asset_source,
)))); ))));
let ctx = app.0.clone();
platform.on_menu_command(Box::new(move |command, arg| {
ctx.borrow_mut()
.dispatch_global_action_with_dyn_arg(command, arg.unwrap_or(&()));
}));
app.0.borrow_mut().weak_self = Some(Rc::downgrade(&app.0)); app.0.borrow_mut().weak_self = Some(Rc::downgrade(&app.0));
Ok(app) Ok(app)
} }
@ -170,20 +177,6 @@ impl App {
self self
} }
pub fn on_menu_command<F>(self, mut callback: F) -> Self
where
F: 'static + FnMut(&str, Option<&(dyn Any + 'static)>, &mut MutableAppContext),
{
let ctx = self.0.clone();
self.0
.borrow()
.platform
.on_menu_command(Box::new(move |command, arg| {
callback(command, arg, &mut *ctx.borrow_mut())
}));
self
}
pub fn on_open_files<F>(self, mut callback: F) -> Self pub fn on_open_files<F>(self, mut callback: F) -> Self
where where
F: 'static + FnMut(Vec<PathBuf>, &mut MutableAppContext), F: 'static + FnMut(Vec<PathBuf>, &mut MutableAppContext),
@ -646,7 +639,7 @@ impl MutableAppContext {
self.dispatch_global_action_with_dyn_arg(name, Box::new(arg).as_ref()); self.dispatch_global_action_with_dyn_arg(name, Box::new(arg).as_ref());
} }
pub fn dispatch_global_action_with_dyn_arg(&mut self, name: &str, arg: &dyn Any) { fn dispatch_global_action_with_dyn_arg(&mut self, name: &str, arg: &dyn Any) {
if let Some((name, mut handlers)) = self.global_actions.remove_entry(name) { if let Some((name, mut handlers)) = self.global_actions.remove_entry(name) {
self.pending_flushes += 1; self.pending_flushes += 1;
for handler in handlers.iter_mut().rev() { for handler in handlers.iter_mut().rev() {

11
zed/src/main.rs
View File

@ -1,12 +1,9 @@
use fs::OpenOptions; use fs::OpenOptions;
use gpui::PathPromptOptions;
use log::LevelFilter; use log::LevelFilter;
use simplelog::SimpleLogger; use simplelog::SimpleLogger;
use std::{fs, path::PathBuf}; use std::{fs, path::PathBuf};
use zed::{ use zed::{
assets, editor, file_finder, menus, assets, editor, file_finder, menus, settings,
settings::{self, Settings},
watch::Receiver,
workspace::{self, OpenParams}, workspace::{self, OpenParams},
}; };
@ -16,11 +13,7 @@ fn main() {
let app = gpui::App::new(assets::Assets).unwrap(); let app = gpui::App::new(assets::Assets).unwrap();
let (_, settings_rx) = settings::channel(&app.font_cache()).unwrap(); let (_, settings_rx) = settings::channel(&app.font_cache()).unwrap();
app.set_menus(menus::menus(settings_rx.clone())); app.set_menus(menus::menus(settings_rx.clone()));
app.on_menu_command(move |command, arg, ctx| { app.run(move |ctx| {
eprintln!("command: {:?} {:?}", command, arg);
ctx.dispatch_global_action_with_dyn_arg(command, arg.unwrap_or(&()))
})
.run(move |ctx| {
workspace::init(ctx); workspace::init(ctx);
editor::init(ctx); editor::init(ctx);
file_finder::init(ctx); file_finder::init(ctx);