EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Reopen panels from the Window menu when the dock is empty (#529)
MarekSpodBiedry0dc4ba381219
diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rsindex 65bca8803..8785aeb29 100644--- a/crates/ui-egui/src/dock.rs+++ b/crates/ui-egui/src/dock.rs@@ -501,8 +501,27 @@ impl DockNode {},}}- if !add(self, p, near) && !add(self, p, PanelKind::EffectsPresets) {- add(self, p, PanelKind::Project);+ fn add_first(n: &mut DockNode, p: PanelKind) -> bool {+ match n {+ DockNode::Split { a, b, .. } => add_first(a, p) || add_first(b, p),+ DockNode::Tabs { panels, active } if !panels.is_empty() => {+ panels.push(p);+ *active = panels.len() - 1;+ true+ }+ DockNode::Stack { entries } if !entries.is_empty() => {+ entries.push(StackEntry { panel: p, open: true, height: None });+ true+ }+ _ => false,+ }+ }+ if self.panel_count() == 0 {+ // Every panel was closed: there is no anchor, so the panel becomes the whole dock.+ *self = tabs(&[p], 0);+ } else if !add(self, p, near) && !add(self, p, PanelKind::EffectsPresets) && !add(self, p, PanelKind::Project) {+ // None of the anchors is docked (e.g. Minimal with Timeline closed): use the first group.+ add_first(self, p);}}}@@ -1181,6 +1200,24 @@ pub fn placeholder(ui: &mut egui::Ui, rect: Rect, t: &Tokens, text: &str) {mod tests {use super::*;+ #[test]+ fn open_near_in_an_empty_dock_makes_the_panel_the_dock() {+ for p in [PanelKind::Composition, PanelKind::Timeline, PanelKind::Project] {+ let mut d = tabs(&[], 0);+ d.open_near(p, PanelKind::EffectsPresets);+ assert!(d.is_visible(p));+ assert_eq!(d.panel_count(), 1);+ }+ }++ #[test]+ fn open_near_without_any_anchor_uses_the_first_group() {+ let mut d = tabs(&[PanelKind::Composition], 0);+ d.open_near(PanelKind::Timeline, PanelKind::EffectsPresets);+ assert!(d.is_visible(PanelKind::Timeline));+ assert_eq!(d.panel_count(), 2);+ }+#[test]fn stacked_panels_toggle_open_close() {use PanelKind::*;