zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make focusing the parent an effect to avoid querying ancestors

Browse Source
This commit is contained in:
Antonio Scandurra 2023-05-05 10:04:54 +02:00
parent d6b0569bed
commit 80ad59a620
5 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
crates/gpui/src/app.rs
View File

@ -1466,10 +1466,11 @@ impl AppContext {
});
if let Some(view_id) = change_focus_to {
self.pending_effects.push_back(Effect::Focus {
window_id,
view_id: Some(view_id),
});
self.pending_effects
.push_back(Effect::Focus(FocusEffect::View {
window_id,
view_id: Some(view_id),
}));
}
self.pending_effects
@ -1491,7 +1492,7 @@ impl AppContext {
let mut refreshing = false;
let mut updated_windows = HashSet::default();
let mut focused_views = HashMap::default();
let mut focus_changes = HashMap::default();
loop {
self.remove_dropped_entities();
if let Some(effect) = self.pending_effects.pop_front() {
@ -1566,8 +1567,8 @@ impl AppContext {
self.handle_entity_release_effect(view_id, view.as_any())
}
Effect::Focus { window_id, view_id } => {
focused_views.insert(window_id, view_id);
Effect::Focus(effect) => {
focus_changes.insert(effect.window_id(), effect);
}
Effect::FocusObservation {
@ -1691,8 +1692,8 @@ impl AppContext {
});
}
for (window_id, view_id) in focused_views.drain() {
self.handle_focus_effect(window_id, view_id);
for (_, effect) in focus_changes.drain() {
self.handle_focus_effect(effect);
}
if self.pending_effects.is_empty() {
@ -1869,14 +1870,17 @@ impl AppContext {
});
}
fn handle_focus_effect(&mut self, window_id: usize, mut focused_id: Option<usize>) {
let mut blurred_id = None;
fn handle_focus_effect(&mut self, effect: FocusEffect) {
let window_id = effect.window_id();
self.update_window(window_id, |cx| {
let focused_id = match effect {
FocusEffect::View { view_id, .. } => view_id,
FocusEffect::ViewParent { view_id, .. } => cx.ancestors(view_id).skip(1).next(),
};
if cx.window.focused_view_id == focused_id {
focused_id = None;
return;
}
blurred_id = cx.window.focused_view_id;
let blurred_id = cx.window.focused_view_id;
cx.window.focused_view_id = focused_id;
let blurred_parents = blurred_id
@ -1959,7 +1963,7 @@ impl AppContext {
pub fn focus(&mut self, window_id: usize, view_id: Option<usize>) {
self.pending_effects
.push_back(Effect::Focus { window_id, view_id });
.push_back(Effect::Focus(FocusEffect::View { window_id, view_id }));
}
fn spawn_internal<F, Fut, T>(&mut self, task_name: Option<&'static str>, f: F) -> Task<T>
@ -2055,6 +2059,27 @@ pub struct WindowInvalidation {
pub removed: Vec<usize>,
}
#[derive(Debug)]
pub enum FocusEffect {
View {
window_id: usize,
view_id: Option<usize>,
},
ViewParent {
window_id: usize,
view_id: usize,
},
}
impl FocusEffect {
fn window_id(&self) -> usize {
match self {
FocusEffect::View { window_id, .. } => *window_id,
FocusEffect::ViewParent { window_id, .. } => *window_id,
}
}
}
pub enum Effect {
Subscription {
entity_id: usize,
@ -2100,10 +2125,7 @@ pub enum Effect {
view_id: usize,
view: Box<dyn AnyView>,
},
Focus {
window_id: usize,
view_id: Option<usize>,
},
Focus(FocusEffect),
FocusObservation {
view_id: usize,
subscription_id: usize,
@ -2219,11 +2241,7 @@ impl Debug for Effect {
.debug_struct("Effect::ViewRelease")
.field("view_id", view_id)
.finish(),
Effect::Focus { window_id, view_id } => f
.debug_struct("Effect::Focus")
.field("window_id", window_id)
.field("view_id", view_id)
.finish(),
Effect::Focus(focus) => f.debug_tuple("Effect::Focus").field(focus).finish(),
Effect::FocusObservation {
view_id,
subscription_id,
@ -2849,12 +2867,14 @@ impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
}
}
pub fn focus_parent_view(&mut self) {
let next = self.ancestors(self.view_id).next().clone();
if let Some(parent_view_id) = next {
let window_id = self.window_id;
self.window_context.focus(window_id, Some(parent_view_id));
}
pub fn focus_parent(&mut self) {
let window_id = self.window_id;
let view_id = self.view_id;
self.pending_effects
.push_back(Effect::Focus(FocusEffect::ViewParent {
window_id,
view_id,
}));
}
pub fn blur(&mut self) {

2
crates/search/src/project_search.rs
View File

@ -200,7 +200,7 @@ impl View for ProjectSearchView {
.flex(1., true)
})
.on_down(MouseButton::Left, |_, _, cx| {
cx.focus_parent_view();
cx.focus_parent();
})
.into_any_named("project search view")
} else {

2
crates/terminal_view/src/terminal_element.rs
View File

@ -370,7 +370,7 @@ impl TerminalElement {
f: impl Fn(&mut Terminal, Vector2F, E, &mut ModelContext<Terminal>),
) -> impl Fn(E, &mut TerminalView, &mut EventContext<TerminalView>) {
move |event, _: &mut TerminalView, cx| {
cx.focus_parent_view();
cx.focus_parent();
if let Some(conn_handle) = connection.upgrade(cx) {
conn_handle.update(cx, |terminal, cx| {
f(terminal, origin, event, cx);

2
crates/workspace/src/pane.rs
View File

@ -1770,7 +1770,7 @@ impl View for Pane {
self.render_blank_pane(&theme, cx)
})
.on_down(MouseButton::Left, |_, _, cx| {
cx.focus_parent_view();
cx.focus_parent();
})
.into_any()
}

2
crates/workspace/src/shared_screen.rs
View File

@ -90,7 +90,7 @@ impl View for SharedScreen {
.contained()
.with_style(cx.global::<Settings>().theme.shared_screen)
})
.on_down(MouseButton::Left, |_, _, cx| cx.focus_parent_view())
.on_down(MouseButton::Left, |_, _, cx| cx.focus_parent())
.into_any()
}
}