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

Blur focused view when project becomes read-only

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-03-04 17:28:53 +01:00
parent b21d91db22
commit 77e913b5a4
3 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1376,7 +1376,7 @@ impl MutableAppContext {
window_id, window_id,
Window { Window {
root_view: root_view.clone().into(), root_view: root_view.clone().into(),
focused_view_id: root_view.id(), focused_view_id: Some(root_view.id()),
invalidation: None, invalidation: None,
}, },
); );
@ -1544,7 +1544,7 @@ impl MutableAppContext {
.get_or_insert_with(Default::default) .get_or_insert_with(Default::default)
.removed .removed
.push(view_id); .push(view_id);
if window.focused_view_id == view_id { if window.focused_view_id == Some(view_id) {
Some(window.root_view.id()) Some(window.root_view.id())
} else { } else {
None None
@ -1552,7 +1552,7 @@ impl MutableAppContext {
}); });
if let Some(view_id) = change_focus_to { if let Some(view_id) = change_focus_to {
self.focus(window_id, view_id); self.focus(window_id, Some(view_id));
} }
self.pending_effects self.pending_effects
@ -1755,7 +1755,7 @@ impl MutableAppContext {
} }
} }
fn focus(&mut self, window_id: usize, focused_id: usize) { fn focus(&mut self, window_id: usize, focused_id: Option<usize>) {
if self if self
.cx .cx
.windows .windows
@ -1767,7 +1767,7 @@ impl MutableAppContext {
} }
self.update(|this| { self.update(|this| {
let blurred_id = this.cx.windows.get_mut(&window_id).map(|window| { let blurred_id = this.cx.windows.get_mut(&window_id).and_then(|window| {
let blurred_id = window.focused_view_id; let blurred_id = window.focused_view_id;
window.focused_view_id = focused_id; window.focused_view_id = focused_id;
blurred_id blurred_id
@ -1780,10 +1780,12 @@ impl MutableAppContext {
} }
} }
if let Some(focused_id) = focused_id {
if let Some(mut focused_view) = this.cx.views.remove(&(window_id, focused_id)) { if let Some(mut focused_view) = this.cx.views.remove(&(window_id, focused_id)) {
focused_view.on_focus(this, window_id, focused_id); focused_view.on_focus(this, window_id, focused_id);
this.cx.views.insert((window_id, focused_id), focused_view); this.cx.views.insert((window_id, focused_id), focused_view);
} }
}
}) })
} }
@ -1958,7 +1960,7 @@ impl AppContext {
pub fn focused_view_id(&self, window_id: usize) -> Option<usize> { pub fn focused_view_id(&self, window_id: usize) -> Option<usize> {
self.windows self.windows
.get(&window_id) .get(&window_id)
.map(|window| window.focused_view_id) .and_then(|window| window.focused_view_id)
} }
pub fn background(&self) -> &Arc<executor::Background> { pub fn background(&self) -> &Arc<executor::Background> {
@ -2052,7 +2054,7 @@ impl ReadView for AppContext {
struct Window { struct Window {
root_view: AnyViewHandle, root_view: AnyViewHandle,
focused_view_id: usize, focused_view_id: Option<usize>,
invalidation: Option<WindowInvalidation>, invalidation: Option<WindowInvalidation>,
} }
@ -2080,7 +2082,7 @@ pub enum Effect {
}, },
Focus { Focus {
window_id: usize, window_id: usize,
view_id: usize, view_id: Option<usize>,
}, },
ResizeWindow { ResizeWindow {
window_id: usize, window_id: usize,
@ -2514,14 +2516,21 @@ impl<'a, T: View> ViewContext<'a, T> {
let handle = handle.into(); let handle = handle.into();
self.app.pending_effects.push_back(Effect::Focus { self.app.pending_effects.push_back(Effect::Focus {
window_id: handle.window_id, window_id: handle.window_id,
view_id: handle.view_id, view_id: Some(handle.view_id),
}); });
} }
pub fn focus_self(&mut self) { pub fn focus_self(&mut self) {
self.app.pending_effects.push_back(Effect::Focus { self.app.pending_effects.push_back(Effect::Focus {
window_id: self.window_id, window_id: self.window_id,
view_id: self.view_id, view_id: Some(self.view_id),
});
}
pub fn blur(&mut self) {
self.app.pending_effects.push_back(Effect::Focus {
window_id: self.window_id,
view_id: None,
}); });
} }

6
crates/gpui/src/presenter.rs
View file

@ -51,13 +51,15 @@ impl Presenter {
} }
pub fn dispatch_path(&self, app: &AppContext) -> Vec<usize> { pub fn dispatch_path(&self, app: &AppContext) -> Vec<usize> {
let mut view_id = app.focused_view_id(self.window_id).unwrap(); let mut path = Vec::new();
let mut path = vec![view_id]; if let Some(mut view_id) = app.focused_view_id(self.window_id) {
path.push(view_id);
while let Some(parent_id) = self.parents.get(&view_id).copied() { while let Some(parent_id) = self.parents.get(&view_id).copied() {
path.push(parent_id); path.push(parent_id);
view_id = parent_id; view_id = parent_id;
} }
path.reverse(); path.reverse();
}
path path
} }

8
crates/workspace/src/workspace.rs
View file

@ -576,7 +576,13 @@ pub struct Workspace {
impl Workspace { impl Workspace {
pub fn new(params: &WorkspaceParams, cx: &mut ViewContext<Self>) -> Self { pub fn new(params: &WorkspaceParams, cx: &mut ViewContext<Self>) -> Self {
cx.observe(&params.project, |_, _, cx| cx.notify()).detach(); cx.observe(&params.project, |_, project, cx| {
if project.read(cx).is_read_only() {
cx.blur();
}
cx.notify()
})
.detach();
let pane = cx.add_view(|_| Pane::new(params.settings.clone())); let pane = cx.add_view(|_| Pane::new(params.settings.clone()));
let pane_id = pane.id(); let pane_id = pane.id();