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

fix(docking): improve DockGroup robustness and state preservation

Browse Source
This commit is contained in:
Misaki
2026-03-28 21:59:44 +09:00
parent 09576bb6e1
commit e92e365a3a
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Editor/Ghost.Editor/View/Controls/Docking/DockGroup.cs
View File

@@ -4,10 +4,10 @@ using Microsoft.UI.Xaml.Data;
namespace Ghost.Editor.View.Controls.Docking;
[TemplatePart(Name = PART_TabView, Type = typeof(TabView))]
[TemplatePart(Name = PART_TAB_VIEW, Type = typeof(TabView))]
public partial class DockGroup : DockContainer
{
private const string PART_TabView = "PART_TabView";
private const string PART_TAB_VIEW = "PART_TabView";
private TabView? _tabView;
public DockGroup()
@@ -17,6 +17,8 @@ public partial class DockGroup : DockContainer
public override void AddChild(DockModule module)
{
ArgumentNullException.ThrowIfNull(module);
if (module is not DockDocument)
{
throw new ArgumentException($"{nameof(DockGroup)} only accepts {nameof(DockDocument)} children.", nameof(module));
@@ -28,7 +30,7 @@ public partial class DockGroup : DockContainer
protected override void OnApplyTemplate()
{
base.OnApplyTemplate();
_tabView = GetTemplateChild(PART_TabView) as TabView;
_tabView = GetTemplateChild(PART_TAB_VIEW) as TabView;
UpdateTabs();
}
@@ -41,7 +43,11 @@ public partial class DockGroup : DockContainer
{
if (_tabView == null) return;
var selectedDoc = _tabView.SelectedItem is TabViewItem selectedItem ? selectedItem.Tag as DockDocument : null;
_tabView.TabItems.Clear();
TabViewItem? newSelectedItem = null;
foreach (var child in Children)
{
if (child is DockDocument doc)
@@ -66,7 +72,17 @@ public partial class DockGroup : DockContainer
});
_tabView.TabItems.Add(tabItem);
if (doc == selectedDoc)
{
newSelectedItem = tabItem;
}
}
}
if (newSelectedItem != null)
{
_tabView.SelectedItem = newSelectedItem;
}
}
}