mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 06:05:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'main' into vim2

Browse source
This commit is contained in:
Conrad Irwin 2023-12-11 10:19:18 -07:00
commit af7c93b8d5
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui2/src/action.rs
View file

@ -183,6 +183,8 @@ macro_rules! impl_actions {
Ok(std::boxed::Box::new(gpui::serde_json::from_value::<Self>(value)?)) Ok(std::boxed::Box::new(gpui::serde_json::from_value::<Self>(value)?))
} }
); );
gpui::register_action!($name);
)* )*
}; };
} }

1
crates/gpui2/src/elements/div.rs
View file

@ -964,6 +964,7 @@ impl Interactivity {
let interactive_bounds = interactive_bounds.clone(); let interactive_bounds = interactive_bounds.clone();
cx.on_mouse_event(move |event: &MouseDownEvent, phase, cx| { cx.on_mouse_event(move |event: &MouseDownEvent, phase, cx| {
if phase == DispatchPhase::Bubble if phase == DispatchPhase::Bubble
&& event.button == MouseButton::Left
&& interactive_bounds.visibly_contains(&event.position, cx) && interactive_bounds.visibly_contains(&event.position, cx)
{ {
*pending_mouse_down.borrow_mut() = Some(event.clone()); *pending_mouse_down.borrow_mut() = Some(event.clone());

2
crates/terminal_view2/src/terminal_panel.rs
View file

@ -24,7 +24,7 @@ use anyhow::Result;
const TERMINAL_PANEL_KEY: &'static str = "TerminalPanel"; const TERMINAL_PANEL_KEY: &'static str = "TerminalPanel";
actions!(terminal_view, [ToggleFocus]); actions!(terminal_panel, [ToggleFocus]);
pub fn init(cx: &mut AppContext) { pub fn init(cx: &mut AppContext) {
cx.observe_new_views( cx.observe_new_views(