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

Notify old/new ancestors of the focused view when they change

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-17 17:12:12 +02:00
parent 981129ef8e
commit 747fbfadeb
2 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/gpui/src/app.rs
View file

@ -1694,12 +1694,54 @@ impl AppContext {
if let Some(invalidation) = invalidation { if let Some(invalidation) = invalidation {
let appearance = cx.window.platform_window.appearance(); let appearance = cx.window.platform_window.appearance();
cx.invalidate(invalidation, appearance); cx.invalidate(invalidation, appearance);
if cx.layout(refreshing).log_err().is_some() { if let Some(old_parents) = cx.layout(refreshing).log_err() {
updated_windows.insert(window_id); updated_windows.insert(window_id);
if let Some(focused_view_id) = cx.focused_view_id() {
let old_ancestors = std::iter::successors(
Some(focused_view_id),
|&view_id| old_parents.get(&view_id).copied(),
)
.collect::<HashSet<_>>();
let new_ancestors =
cx.ancestors(focused_view_id).collect::<HashSet<_>>();
// Notify the old ancestors of the focused view when they don't contain it anymore.
for old_ancestor in old_ancestors.iter().copied() {
if !new_ancestors.contains(&old_ancestor) {
if let Some(mut view) =
cx.views.remove(&(window_id, old_ancestor))
{
view.focus_out(
focused_view_id,
cx,
old_ancestor,
);
cx.views
.insert((window_id, old_ancestor), view);
}
}
}
// Notify the new ancestors of the focused view if they contain it now.
for new_ancestor in new_ancestors.iter().copied() {
if !old_ancestors.contains(&new_ancestor) {
if let Some(mut view) =
cx.views.remove(&(window_id, new_ancestor))
{
view.focus_in(
focused_view_id,
cx,
new_ancestor,
);
cx.views
.insert((window_id, new_ancestor), view);
}
}
}
// When the previously-focused view isn't rendered and // When the previously-focused view isn't rendered and
// there isn't any pending focus, focus the root view. // there isn't any pending focus, focus the root view.
if let Some(focused_view_id) = cx.focused_view_id() {
let root_view_id = cx.window.root_view().id(); let root_view_id = cx.window.root_view().id();
if focused_view_id != root_view_id if focused_view_id != root_view_id
&& !cx.window.parents.contains_key(&focused_view_id) && !cx.window.parents.contains_key(&focused_view_id)

7
crates/gpui/src/app/window.rs
View file

@ -29,6 +29,7 @@ use sqlez::{
}; };
use std::{ use std::{
any::TypeId, any::TypeId,
mem,
ops::{Deref, DerefMut, Range}, ops::{Deref, DerefMut, Range},
}; };
use util::ResultExt; use util::ResultExt;
@ -890,7 +891,7 @@ impl<'a> WindowContext<'a> {
Ok(element) Ok(element)
} }
pub(crate) fn layout(&mut self, refreshing: bool) -> Result<()> { pub(crate) fn layout(&mut self, refreshing: bool) -> Result<HashMap<usize, usize>> {
let window_size = self.window.platform_window.content_size(); let window_size = self.window.platform_window.content_size();
let root_view_id = self.window.root_view().id(); let root_view_id = self.window.root_view().id();
let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap(); let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
@ -923,11 +924,11 @@ impl<'a> WindowContext<'a> {
} }
} }
self.window.parents = new_parents; let old_parents = mem::replace(&mut self.window.parents, new_parents);
self.window self.window
.rendered_views .rendered_views
.insert(root_view_id, rendered_root); .insert(root_view_id, rendered_root);
Ok(()) Ok(old_parents)
} }
pub(crate) fn paint(&mut self) -> Result<Scene> { pub(crate) fn paint(&mut self) -> Result<Scene> {