oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refocus root view if focused view is removed

Browse Source 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Nathan Sobo
2021-05-06 16:30:10 -06:00
co-authored by Max Brunsfeld
parent 5e08a02ca8
commit 35e0eaaae2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpui/src/app.rs
+10 -1
View File
@@ -884,12 +884,21 @@ impl MutableAppContext {
self.model_observations.remove(&view_id);
self.async_observations.remove(&view_id);
self.ctx.views.remove(&(window_id, view_id));
if let Some(window) = self.ctx.windows.get_mut(&window_id) {
let change_focus_to = self.ctx.windows.get_mut(&window_id).and_then(|window| {
window
.invalidation
.get_or_insert_with(Default::default)
.removed
.push(view_id);
if window.focused_view_id == view_id {
Some(window.root_view.id())
} else {
None
}
});
if let Some(view_id) = change_focus_to {
self.focus(window_id, view_id);
}
}