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

fix(docking): address final code quality issues in docking layout

Browse Source
This commit is contained in:
Misaki
2026-03-28 23:01:28 +09:00
parent 666528263b
commit 2946b905c6
4 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Editor/Ghost.Editor/View/Controls/Docking/DockPanel.cs
View File

@@ -48,6 +48,10 @@ public class DockPanel : DockContainer
{
if (Children.Count == 0)
{
if (Root != null && Root.RootModule == this)
{
Root.NotifyLayoutEmpty();
}
base.CheckCleanup();
}
else if (Children.Count == 1)
@@ -59,16 +63,10 @@ public class DockPanel : DockContainer
{
owner.ReplaceChild(this, child);
}
else if (Root != null && Root.RootPanel == this)
else if (Root != null && Root.RootModule == this)
{
// We only collapse the root panel if the child is also a DockPanel
// because DockingLayout.RootPanel is strongly typed as DockPanel,
// so we can't assign a DockGroup to it directly.
if (child is DockPanel childPanel)
{
RemoveChildInternal(childPanel, false);
Root.RootPanel = childPanel;
}
RemoveChildInternal(child, false);
Root.RootModule = child;
}
}
}

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

@@ -14,20 +14,27 @@ public class DockingLayout : Control
private const string PART_HIGHLIGHT = "PART_Highlight";
/// <summary>
/// Gets or sets the root panel of the docking layout.
/// Gets or sets the root module of the docking layout.
/// </summary>
public static readonly DependencyProperty RootPanelProperty = DependencyProperty.Register(
nameof(RootPanel), typeof(DockPanel), typeof(DockingLayout), new PropertyMetadata(null, OnRootPanelChanged));
public static readonly DependencyProperty RootModuleProperty = DependencyProperty.Register(
nameof(RootModule), typeof(DockModule), typeof(DockingLayout), new PropertyMetadata(null, OnRootModuleChanged));
/// <summary>
/// Gets or sets the root panel of the docking layout.
/// Gets or sets the root module of the docking layout.
/// </summary>
public DockPanel? RootPanel
public DockModule? RootModule
{
get => (DockPanel?)GetValue(RootPanelProperty);
set => SetValue(RootPanelProperty, value);
get => (DockModule?)GetValue(RootModuleProperty);
set => SetValue(RootModuleProperty, value);
}
/// <summary>
/// Occurs when the layout becomes empty.
/// </summary>
public event EventHandler? LayoutEmpty;
internal void NotifyLayoutEmpty() => LayoutEmpty?.Invoke(this, EventArgs.Empty);
private Canvas? _overlayCanvas;
private DockRegionHighlight? _highlight;
private readonly List<FloatingWindow> _floatingWindows = new();
@@ -47,28 +54,28 @@ public class DockingLayout : Control
_highlight = GetTemplateChild(PART_HIGHLIGHT) as DockRegionHighlight;
}
private static void OnRootPanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
private static void OnRootModuleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is DockingLayout layout)
{
if (e.OldValue is DockPanel oldPanel)
if (e.OldValue is DockModule oldModule)
{
oldPanel.Root = null;
oldModule.Root = null;
}
if (e.NewValue is DockPanel newPanel)
if (e.NewValue is DockModule newModule)
{
if (newPanel.Root != null && newPanel.Root != layout)
if (newModule.Root != null && newModule.Root != layout)
{
throw new InvalidOperationException("Panel is already owned by another DockingLayout");
throw new InvalidOperationException("Module is already owned by another DockingLayout");
}
if (newPanel.Owner != null)
if (newModule.Owner != null)
{
newPanel.Owner.RemoveChild(newPanel);
newModule.Owner.RemoveChild(newModule);
}
newPanel.Root = layout;
newModule.Root = layout;
}
}
}
@@ -88,19 +95,22 @@ public class DockingLayout : Control
throw new ArgumentException("targetGroup does not belong to this DockingLayout", nameof(targetGroup));
}
if (RootPanel == null)
if (RootModule == null)
{
RootPanel = new DockPanel();
RootModule = new DockPanel();
}
if (targetGroup == null)
{
targetGroup = FindFirstDockGroup(RootPanel);
targetGroup = FindFirstDockGroup(RootModule as DockContainer);
if (targetGroup == null)
{
targetGroup = new DockGroup();
RootPanel.AddChild(targetGroup);
if (RootModule is DockContainer container)
{
container.AddChild(targetGroup);
}
}
}
@@ -119,16 +129,30 @@ public class DockingLayout : Control
doc.Owner?.RemoveChild(doc);
var parentPanel = targetGroup.Owner as DockPanel;
if (parentPanel == null)
{
throw new InvalidOperationException("targetGroup must be owned by a DockPanel to be split.");
}
var newGroup = new DockGroup();
newGroup.AddChild(doc);
var orientation = (target == DockTarget.Left || target == DockTarget.Right) ? Orientation.Horizontal : Orientation.Vertical;
if (parentPanel == null)
{
// targetGroup is the RootModule
var newPanel = new DockPanel { Orientation = orientation };
RootModule = newPanel;
if (target == DockTarget.Left || target == DockTarget.Top)
{
newPanel.AddChild(newGroup);
newPanel.AddChild(targetGroup);
}
else
{
newPanel.AddChild(targetGroup);
newPanel.AddChild(newGroup);
}
return;
}
int index = parentPanel.Children.IndexOf(targetGroup);
if (index < 0)

2
src/Editor/Ghost.Editor/View/Controls/Docking/DockingLayout.xaml
View File

@@ -8,7 +8,7 @@
<Setter.Value>
<ControlTemplate TargetType="local:DockingLayout">
<Grid>
<ContentPresenter x:Name="PART_Content" Content="{TemplateBinding RootPanel}" />
<ContentPresenter x:Name="PART_Content" Content="{TemplateBinding RootModule}" />
<Canvas x:Name="PART_OverlayCanvas" IsHitTestVisible="False">
<local:DockRegionHighlight x:Name="PART_Highlight" Visibility="Collapsed" />
</Canvas>

7
src/Editor/Ghost.Editor/View/Controls/Docking/FloatingWindow.cs
View File

@@ -19,13 +19,12 @@ public class FloatingWindow : Window
var group = new DockGroup();
group.AddChild(document);
var panel = new DockPanel();
panel.AddChild(group);
layout.RootPanel = panel;
layout.RootModule = group;
layout.LayoutEmpty += (s, e) => Close();
Content = layout;
// Basic window setup
AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 600));
AppWindow.Resize(new global::Windows.Graphics.SizeInt32(800, 600));
}
}