mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-20 02:47:34 +03:00
Quick and dirty attempt to immediately apply focus change in tests
Doesn't quite work yet
This commit is contained in:
parent
cfc050e3fe
commit
cd08d349a5
@ -571,6 +571,7 @@ impl AppContext {
|
||||
loop {
|
||||
self.release_dropped_entities();
|
||||
self.release_dropped_focus_handles();
|
||||
|
||||
if let Some(effect) = self.pending_effects.pop_front() {
|
||||
match effect {
|
||||
Effect::Notify { emitter } => {
|
||||
@ -610,7 +611,8 @@ impl AppContext {
|
||||
.values()
|
||||
.filter_map(|window| {
|
||||
let window = window.as_ref()?;
|
||||
window.dirty.then_some(window.handle)
|
||||
dbg!(window.focus_invalidated);
|
||||
(window.dirty || window.focus_invalidated).then_some(window.handle)
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
{
|
||||
|
@ -243,6 +243,9 @@ pub struct Window {
|
||||
pub(crate) dirty: bool,
|
||||
activation_observers: SubscriberSet<(), AnyObserver>,
|
||||
pub(crate) focus: Option<FocusId>,
|
||||
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
pub(crate) focus_invalidated: bool,
|
||||
}
|
||||
|
||||
pub(crate) struct ElementStateBox {
|
||||
@ -381,6 +384,9 @@ impl Window {
|
||||
dirty: false,
|
||||
activation_observers: SubscriberSet::new(),
|
||||
focus: None,
|
||||
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
focus_invalidated: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -461,6 +467,12 @@ impl<'a> WindowContext<'a> {
|
||||
.rendered_frame
|
||||
.dispatch_tree
|
||||
.clear_pending_keystrokes();
|
||||
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
{
|
||||
self.window.focus_invalidated = true;
|
||||
}
|
||||
|
||||
self.notify();
|
||||
}
|
||||
|
||||
@ -1274,13 +1286,15 @@ impl<'a> WindowContext<'a> {
|
||||
self.window.root_view = Some(root_view);
|
||||
|
||||
let previous_focus_path = self.window.rendered_frame.focus_path();
|
||||
|
||||
let window = &mut self.window;
|
||||
mem::swap(&mut window.rendered_frame, &mut window.next_frame);
|
||||
|
||||
mem::swap(&mut self.window.rendered_frame, &mut self.window.next_frame);
|
||||
let current_focus_path = self.window.rendered_frame.focus_path();
|
||||
|
||||
if previous_focus_path != current_focus_path {
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
{
|
||||
self.window.focus_invalidated = false;
|
||||
}
|
||||
|
||||
if !previous_focus_path.is_empty() && current_focus_path.is_empty() {
|
||||
self.window
|
||||
.blur_listeners
|
||||
|
@ -739,6 +739,7 @@ impl ProjectPanel {
|
||||
});
|
||||
self.filename_editor.update(cx, |editor, cx| {
|
||||
editor.clear(cx);
|
||||
println!("focusing");
|
||||
editor.focus(cx);
|
||||
});
|
||||
self.update_visible_entries(Some((worktree_id, NEW_ENTRY_ID)), cx);
|
||||
|
Loading…
Reference in New Issue
Block a user