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

fix(dock): make drag payload single source of truth and improve diagnostics

Browse Source
This commit is contained in:
Misaki
2026-03-28 17:03:27 +09:00
parent c1f7f3e14e
commit 65a335fc1a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Editor/Ghost.Editor/View/Controls/DockLayout.cs
View File

@@ -298,7 +298,6 @@ public sealed partial class DockLayout : Control
} }
private object? _draggedItem; private object? _draggedItem;
private DockPanelNode? _sourceNode;
private DockPosition _currentDropPosition = DockPosition.None; private DockPosition _currentDropPosition = DockPosition.None;
private record DockDragPayload(object Item, DockPanelNode SourceNode); private record DockDragPayload(object Item, DockPanelNode SourceNode);
@@ -306,11 +305,10 @@ public sealed partial class DockLayout : Control
private void TabView_TabDragStarting(Microsoft.UI.Xaml.Controls.TabView sender, Microsoft.UI.Xaml.Controls.TabViewTabDragStartingEventArgs args) private void TabView_TabDragStarting(Microsoft.UI.Xaml.Controls.TabView sender, Microsoft.UI.Xaml.Controls.TabViewTabDragStartingEventArgs args)
{ {
_draggedItem = args.Item; _draggedItem = args.Item;
_sourceNode = sender.Tag as DockPanelNode;
if (_draggedItem != null && _sourceNode != null) if (_draggedItem != null && sender.Tag is DockPanelNode sourceNode)
{ {
var payload = new DockDragPayload(_draggedItem, _sourceNode); var payload = new DockDragPayload(_draggedItem, sourceNode);
args.Data.Properties.Add(DRAG_PROPERTY_DOCK_TAB, payload); // Identify our drag args.Data.Properties.Add(DRAG_PROPERTY_DOCK_TAB, payload); // Identify our drag
} }
} }
@@ -319,7 +317,6 @@ public sealed partial class DockLayout : Control
{ {
if (e.DataView.Properties.TryGetValue(DRAG_PROPERTY_DOCK_TAB, out var payloadObj) && if (e.DataView.Properties.TryGetValue(DRAG_PROPERTY_DOCK_TAB, out var payloadObj) &&
payloadObj is DockDragPayload payload && payloadObj is DockDragPayload payload &&
payload.Item == _draggedItem &&
sender is FrameworkElement targetElement) sender is FrameworkElement targetElement)
{ {
e.AcceptedOperation = global::Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move; e.AcceptedOperation = global::Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
@@ -353,7 +350,6 @@ public sealed partial class DockLayout : Control
{ {
ClearOverlayState(); ClearOverlayState();
_draggedItem = null; _draggedItem = null;
_sourceNode = null;
} }
private void UpdateDropOverlay(FrameworkElement targetElement, DockPosition position) private void UpdateDropOverlay(FrameworkElement targetElement, DockPosition position)
@@ -398,7 +394,6 @@ public sealed partial class DockLayout : Control
if (!e.DataView.Properties.TryGetValue(DRAG_PROPERTY_DOCK_TAB, out var payloadObj) || if (!e.DataView.Properties.TryGetValue(DRAG_PROPERTY_DOCK_TAB, out var payloadObj) ||
payloadObj is not DockDragPayload payload || payloadObj is not DockDragPayload payload ||
payload.Item != _draggedItem ||
!(sender is FrameworkElement targetElement) || !(sender is FrameworkElement targetElement) ||
!(targetElement.Tag is DockPanelNode targetNode)) !(targetElement.Tag is DockPanelNode targetNode))
{ {
@@ -455,7 +450,8 @@ public sealed partial class DockLayout : Control
} }
else else
{ {
Logger.LogWarning($"TabDroppedOutside: Item {args.Item} not found in source node {sourceNode}."); string itemInfo = args.Item is FrameworkElement fe ? fe.GetType().Name : args.Item.ToString() ?? "unknown";
Logger.LogWarning($"TabDroppedOutside: Item '{itemInfo}' not found in source node (Items count: {sourceNode.Items.Count}).");
} }
} }
} }