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

Emit Focus events from Pane only when it didn't have focus before

Browse source
This commit is contained in:
Antonio Scandurra 2023-12-11 14:02:08 +01:00
parent e7c14dacae
commit 5768f14a03
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/workspace2/src/pane.rs
View file

@ -159,6 +159,7 @@ pub struct Pane {
items: Vec<Box<dyn ItemHandle>>, items: Vec<Box<dyn ItemHandle>>,
activation_history: Vec<EntityId>, activation_history: Vec<EntityId>,
zoomed: bool, zoomed: bool,
was_focused: bool,
active_item_index: usize, active_item_index: usize,
last_focused_view_by_item: HashMap<EntityId, FocusHandle>, last_focused_view_by_item: HashMap<EntityId, FocusHandle>,
autoscroll: bool, autoscroll: bool,
@ -317,6 +318,7 @@ impl Pane {
focus_handle: cx.focus_handle(), focus_handle: cx.focus_handle(),
items: Vec::new(), items: Vec::new(),
activation_history: Vec::new(), activation_history: Vec::new(),
was_focused: false,
zoomed: false, zoomed: false,
active_item_index: 0, active_item_index: 0,
last_focused_view_by_item: Default::default(), last_focused_view_by_item: Default::default(),
@ -413,7 +415,8 @@ impl Pane {
} }
fn focus_in(&mut self, cx: &mut ViewContext<Self>) { fn focus_in(&mut self, cx: &mut ViewContext<Self>) {
if !self.has_focus(cx) { if !self.was_focused {
self.was_focused = true;
cx.emit(Event::Focus); cx.emit(Event::Focus);
cx.notify(); cx.notify();
} }
@ -444,6 +447,7 @@ impl Pane {
} }
fn focus_out(&mut self, cx: &mut ViewContext<Self>) { fn focus_out(&mut self, cx: &mut ViewContext<Self>) {
self.was_focused = false;
self.toolbar.update(cx, |toolbar, cx| { self.toolbar.update(cx, |toolbar, cx| {
toolbar.focus_changed(false, cx); toolbar.focus_changed(false, cx);
}); });