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

Fix tests

Browse Source 
I didn't realize a previous change had broken stuff. We need to always call `remove_dropped_entities` and `update_windows` in `flush_effects`, even if there aren't any effects. To achieve this, I use a `loop` to ensure we call these methods at least once before breaking.
This commit is contained in:
Nathan Sobo
2021-04-28 14:16:10 -06:00
parent 95fae8e9e0
commit 6b357a6ae7
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpui/src/app.rs
+19 -14
View File
@@ -902,25 +902,30 @@ impl MutableAppContext {
if !self.flushing_effects && self.pending_flushes == 0 {
self.flushing_effects = true;
while let Some(effect) = self.pending_effects.pop_front() {
match effect {
Effect::Event { entity_id, payload } => self.emit_event(entity_id, payload),
Effect::ModelNotification { model_id } => self.notify_model_observers(model_id),
Effect::ViewNotification { window_id, view_id } => {
self.notify_view_observers(window_id, view_id)
loop {
if let Some(effect) = self.pending_effects.pop_front() {
match effect {
Effect::Event { entity_id, payload } => self.emit_event(entity_id, payload),
Effect::ModelNotification { model_id } => {
self.notify_model_observers(model_id)
}
Effect::ViewNotification { window_id, view_id } => {
self.notify_view_observers(window_id, view_id)
}
Effect::Focus { window_id, view_id } => {
self.focus(window_id, view_id);
}
}
Effect::Focus { window_id, view_id } => {
self.focus(window_id, view_id);
}
}
if self.pending_effects.is_empty() {
} else {
self.remove_dropped_entities();
self.update_windows();
if self.pending_effects.is_empty() {
self.flushing_effects = false;
break;
}
}
}
self.flushing_effects = false;
}
}