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

Quick and dirty attempt to immediately apply focus change in tests

Browse source 
Doesn't quite work yet
This commit is contained in:
Julia 2023-12-13 21:48:05 -05:00
parent cfc050e3fe
commit cd08d349a5
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/gpui2/src/window.rs
View file

@ -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