Misaki/GhostEngine
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(docking): defer container cleanup to avoid visual tree modification during layout

Browse Source
This commit is contained in:
Misaki
2026-03-29 18:47:38 +09:00
parent d15bd22743
commit e6e38f5eea
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Editor/Ghost.Editor/View/Controls/Docking/DockingLayout.cs
View File

@@ -143,7 +143,6 @@ public partial class DockingLayout : Control
private void SplitGroup(DockGroup targetGroup, DockDocument doc, DockTarget target)
{
doc.Owner?.RemoveChild(doc);
var parentPanel = targetGroup.Owner as DockPanel;
var newGroup = new DockGroup();
@@ -272,6 +271,9 @@ public partial class DockingLayout : Control
HideHighlight();
var target = CalculateDockTarget(targetGroup, position);
var oldOwner = doc.Owner as DockContainer;
oldOwner?.RemoveChildInternal(doc, false);
if (target == DockTarget.Center)
{
if (doc.Owner == targetGroup) return;
@@ -282,6 +284,14 @@ public partial class DockingLayout : Control
if (doc.Owner == targetGroup && targetGroup.Children.Count == 1) return;
SplitGroup(targetGroup, doc, target);
}
if (oldOwner != null)
{
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
{
oldOwner.CheckCleanup();
});
}
}
private DockTarget CalculateDockTarget(DockGroup group, global::Windows.Foundation.Point position)
@@ -301,9 +311,21 @@ public partial class DockingLayout : Control
internal void CreateFloatingWindow(DockDocument doc)
{
ArgumentNullException.ThrowIfNull(doc);
var oldOwner = doc.Owner as DockContainer;
oldOwner?.RemoveChildInternal(doc, false);
var window = new FloatingWindow(doc);
_floatingWindows.Add(window);
window.Closed += (s, e) => _floatingWindows.Remove(window);
window.Activate();
if (oldOwner != null)
{
DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
{
oldOwner.CheckCleanup();
});
}
}
}