@ -39,9 +39,6 @@ namespace ILSpy.AssemblyTree
{ {
public partial class AssemblyListPane : UserControl public partial class AssemblyListPane : UserControl
{ {
// Where a dropped set of assemblies lands relative to the target row.
internal enum DropPosition { Before , After , Append }
ILSpy . Controls . TreeView . TreeSelectionBinder ? selectionBinder ; ILSpy . Controls . TreeView . TreeSelectionBinder ? selectionBinder ;
LanguageSettings ? languageSettings ; LanguageSettings ? languageSettings ;
IReadOnlyList < IContextMenuEntryExport > contextMenuEntries = Array . Empty < IContextMenuEntryExport > ( ) ; IReadOnlyList < IContextMenuEntryExport > contextMenuEntries = Array . Empty < IContextMenuEntryExport > ( ) ;
@ -52,16 +49,6 @@ namespace ILSpy.AssemblyTree
SharpTreeViewItem ? contextMenuOpenItem ; SharpTreeViewItem ? contextMenuOpenItem ;
SharpTreeNode ? contextMenuTargetNode ; SharpTreeNode ? contextMenuTargetNode ;
// Assembly drag-reorder. It's an internal move, so the dragged set is kept in a field rather
// than serialised; the DataTransfer just carries a marker so DragOver/Drop can tell a reorder
// drag from an Explorer file drop.
static readonly DataFormat < string > AssemblyReorderFormat =
DataFormat . CreateStringApplicationFormat ( "ilspy-assembly-reorder" ) ;
IReadOnlyList < AssemblyTreeNode > ? draggingAssemblies ;
AssemblyTreeNode ? pressedAssembly ;
PointerPressedEventArgs ? dragPress ;
Point dragStartPos ;
public AssemblyListPane ( ) public AssemblyListPane ( )
{ {
InitializeComponent ( ) ; InitializeComponent ( ) ;
@ -70,19 +57,11 @@ namespace ILSpy.AssemblyTree
m . MarkTreeReady ( ) ; m . MarkTreeReady ( ) ;
} ; } ;
// Right-press marks the context target without moving selection; MMB opens a new tab.
// Right-press marks the context target without moving selection; MMB opens a new tab.
// Drag-reorder + file drop are owned by SharpTreeView (delegated to the tree nodes).
Tree . AddHandler ( PointerPressedEvent , OnTreePointerPressed , RoutingStrategies . Tunnel ) ; Tree . AddHandler ( PointerPressedEvent , OnTreePointerPressed , RoutingStrategies . Tunnel ) ;
Tree . AddHandler ( ContextRequestedEvent , OnTreeContextRequested , RoutingStrategies . Bubble , handledEventsToo : true ) ; Tree . AddHandler ( ContextRequestedEvent , OnTreeContextRequested , RoutingStrategies . Bubble , handledEventsToo : true ) ;
Tree . AddHandler ( PointerMovedEvent , OnTreePointerMoved , RoutingStrategies . Bubble , handledEventsToo : true ) ;
Tree . AddHandler ( PointerReleasedEvent , OnTreePointerReleased , RoutingStrategies . Bubble , handledEventsToo : true ) ;
Tree . KeyDown + = OnTreeKeyDown ; Tree . KeyDown + = OnTreeKeyDown ;
// Explorer file drop AND internal assembly drag-reorder both arrive through Avalonia's
// DragDrop pipeline; OnTreeDragOver/OnTreeDrop dispatch on the data format.
DragDrop . SetAllowDrop ( Tree , true ) ;
Tree . AddHandler ( DragDrop . DragOverEvent , OnTreeDragOver ) ;
Tree . AddHandler ( DragDrop . DropEvent , OnTreeDrop ) ;
Tree . AddHandler ( DragDrop . DragLeaveEvent , ( _ , _ ) = > HideInsertMarker ( ) ) ;
var registry = TryGetContextMenuRegistry ( ) ; var registry = TryGetContextMenuRegistry ( ) ;
AttachContextMenu ( registry ? . Entries ? ? Array . Empty < IContextMenuEntryExport > ( ) ) ; AttachContextMenu ( registry ? . Entries ? ? Array . Empty < IContextMenuEntryExport > ( ) ) ;
@ -237,76 +216,14 @@ namespace ILSpy.AssemblyTree
// Any non-right press starts a fresh gesture -- drop a stale right-click target.
// Any non-right press starts a fresh gesture -- drop a stale right-click target.
contextMenuTargetNode = null ; contextMenuTargetNode = null ;
SetContextTargetItem ( null ) ; SetContextTargetItem ( null ) ;
pressedAssembly = null ; if ( point . IsMiddleButtonPressed
dragPress = null ; & & hit . FindAncestorOfType < SharpTreeViewItem > ( includeSelf : true ) ? . Node is ILSpyTreeNode node )
var pressedNode = hit . FindAncestorOfType < SharpTreeViewItem > ( includeSelf : true ) ? . Node ;
if ( point . IsMiddleButtonPressed & & pressedNode is ILSpyTreeNode node )
{ {
OpenNodeInNewTab ( node ) ; OpenNodeInNewTab ( node ) ;
e . Handled = true ; e . Handled = true ;
return ;
}
// Remember a top-level assembly row so a subsequent drag can reorder it.
if ( point . IsLeftButtonPressed & & pressedNode is AssemblyTreeNode { Parent : AssemblyListTreeNode , PackageEntry : null } asm )
{
pressedAssembly = asm ;
dragPress = e ;
dragStartPos = e . GetPosition ( Tree ) ;
} }
} }
void OnTreePointerReleased ( object? sender , PointerReleasedEventArgs e )
{
pressedAssembly = null ;
dragPress = null ;
}
async void OnTreePointerMoved ( object? sender , PointerEventArgs e )
{
if ( pressedAssembly is not { } pressed | | dragPress is not { } press )
return ;
if ( ! e . GetCurrentPoint ( Tree ) . Properties . IsLeftButtonPressed )
{
pressedAssembly = null ;
dragPress = null ;
return ;
}
var delta = e . GetPosition ( Tree ) - dragStartPos ;
if ( Math . Abs ( delta . X ) < 4 & & Math . Abs ( delta . Y ) < 4 )
return ;
var dragged = ResolveDraggedAssemblies ( pressed ) ;
pressedAssembly = null ;
dragPress = null ;
if ( dragged . Count = = 0 )
return ;
draggingAssemblies = dragged ;
try
{
var data = new DataTransfer ( ) ;
data . Add ( DataTransferItem . Create ( AssemblyReorderFormat , "1" ) ) ;
await DragDrop . DoDragDropAsync ( press , data , DragDropEffects . Move ) ;
}
finally
{
draggingAssemblies = null ;
}
}
// The dragged set: the whole selection when the pressed row is part of it, otherwise just
// the pressed row -- filtered to movable top-level assemblies.
IReadOnlyList < AssemblyTreeNode > ResolveDraggedAssemblies ( AssemblyTreeNode pressed )
{
IEnumerable < AssemblyTreeNode > candidates =
DataContext is AssemblyTreeModel model & & model . SelectedItems . Contains ( pressed )
? model . SelectedItems . OfType < AssemblyTreeNode > ( )
: new [ ] { pressed } ;
return candidates
. Where ( n = > n . Parent is AssemblyListTreeNode & & n . PackageEntry = = null )
. ToList ( ) ;
}
#endregion
#endregion
#region Keyboard (assembly-specific: Delete, Ctrl+R)
#region Keyboard (assembly-specific: Delete, Ctrl+R)
@ -376,7 +293,10 @@ namespace ILSpy.AssemblyTree
{ {
model . PropertyChanged + = Model_PropertyChanged ; model . PropertyChanged + = Model_PropertyChanged ;
if ( model . Root ! = null ) if ( model . Root ! = null )
{
Tree . Root = model . Root ; Tree . Root = model . Root ;
WireDropSelection ( model ) ;
}
selectionBinder = new ILSpy . Controls . TreeView . TreeSelectionBinder ( Tree , model . SelectedItems ) ; selectionBinder = new ILSpy . Controls . TreeView . TreeSelectionBinder ( Tree , model . SelectedItems ) ;
} }
} }
@ -387,171 +307,36 @@ namespace ILSpy.AssemblyTree
& & e . PropertyName = = nameof ( AssemblyTreeModel . Root ) & & model . Root ! = null ) & & e . PropertyName = = nameof ( AssemblyTreeModel . Root ) & & model . Root ! = null )
{ {
Tree . Root = model . Root ; Tree . Root = model . Root ;
WireDropSelection ( model ) ;
// The flattener rebuilt; re-apply the model selection to the new rows.
// The flattener rebuilt; re-apply the model selection to the new rows.
selectionBinder ? . Refresh ( ) ; selectionBinder ? . Refresh ( ) ;
} }
} }
#endregion
// The drop logic lives on AssemblyListTreeNode (open + move); selecting the result is a view
// concern, so the node delegates it back here, where we resolve the assemblies to tree nodes
#region Drag-reorder + file drop
// and push them through the model selection (which the TreeSelectionBinder reflects).
void WireDropSelection ( AssemblyTreeModel model )
void OnTreeDragOver ( object? sender , DragEventArgs e )
{
if ( draggingAssemblies is { } dragged & & e . DataTransfer . Contains ( AssemblyReorderFormat ) )
{
var ( target , position ) = HitTestTopLevelRow ( e ) ;
bool valid = target ! = null & & CanReorder ( dragged , target , position ) ;
e . DragEffects = valid ? DragDropEffects . Move : DragDropEffects . None ;
UpdateInsertMarker ( e , valid ? position : null ) ;
e . Handled = true ;
return ;
}
if ( ! e . DataTransfer . Contains ( DataFormat . File ) )
return ;
e . DragEffects = DragDropEffects . Copy ;
e . Handled = true ;
}
void OnTreeDrop ( object? sender , DragEventArgs e )
{
if ( draggingAssemblies is { } dragged & & e . DataTransfer . Contains ( AssemblyReorderFormat ) )
{
HideInsertMarker ( ) ;
var ( reorderTarget , reorderPosition ) = HitTestTopLevelRow ( e ) ;
if ( reorderTarget ! = null )
ReorderAssemblies ( dragged , reorderTarget , reorderPosition ) ;
e . DragEffects = DragDropEffects . Move ;
e . Handled = true ;
return ;
}
if ( ! e . DataTransfer . Contains ( DataFormat . File ) )
return ;
var storageItems = e . DataTransfer . TryGetFiles ( ) ;
if ( storageItems = = null | | storageItems . Length = = 0 )
return ;
var files = storageItems
. Select ( f = > f . TryGetLocalPath ( ) )
. Where ( p = > ! string . IsNullOrEmpty ( p ) )
. Select ( p = > p ! )
. ToList ( ) ;
if ( files . Count = = 0 )
return ;
var ( target , position ) = HitTestTopLevelRow ( e ) ;
HandleFileDrop ( files , target , position ) ;
e . DragEffects = DragDropEffects . Copy ;
e . Handled = true ;
}
( AssemblyTreeNode ? target , DropPosition position ) HitTestTopLevelRow ( DragEventArgs e )
{
if ( e . Source is not Visual hit )
return ( null , DropPosition . Append ) ;
var item = hit . FindAncestorOfType < SharpTreeViewItem > ( includeSelf : true ) ;
if ( item ? . Node is not AssemblyTreeNode atn | | atn . Parent is not AssemblyListTreeNode )
return ( null , DropPosition . Append ) ;
var pointer = e . GetPosition ( item ) ;
var position = pointer . Y < item . Bounds . Height / 2 ? DropPosition . Before : DropPosition . After ;
return ( atn , position ) ;
}
// Positions the drop indicator at the top (Before) or bottom (After) edge of the target row.
void UpdateInsertMarker ( DragEventArgs e , DropPosition ? position )
{
if ( position is not { } pos | | pos = = DropPosition . Append
| | ( e . Source as Visual ) ? . FindAncestorOfType < SharpTreeViewItem > ( includeSelf : true ) is not { } item )
{
HideInsertMarker ( ) ;
return ;
}
var topLeft = item . TranslatePoint ( new Point ( 0 , 0 ) , this ) ? ? default ;
double y = topLeft . Y + ( pos = = DropPosition . After ? item . Bounds . Height : 0 ) ;
InsertMarker . Margin = new Thickness ( topLeft . X , y - 1 , 0 , 0 ) ;
InsertMarker . Width = item . Bounds . Width ;
InsertMarker . IsVisible = true ;
}
void HideInsertMarker ( ) = > InsertMarker . IsVisible = false ;
/// <summary>
/// Whether <paramref name="dragged"/> can be reordered to land Before/After
/// <paramref name="target"/>. Only top-level (non-package) assemblies reorder, never onto a
/// child or onto themselves. Mirrors the old AssemblyRowDropHandler validation.
/// </summary>
internal bool CanReorder ( IReadOnlyList < AssemblyTreeNode > dragged , AssemblyTreeNode ? target , DropPosition position )
{ {
if ( position = = DropPosition . Append | | target is not { Parent : AssemblyListTreeNode } | | dragged . Count = = 0 )
return false ;
foreach ( var node in dragged )
{
if ( node . Parent is not AssemblyListTreeNode | | node . PackageEntry ! = null | | ReferenceEquals ( node , target ) )
return false ;
}
return true ;
}
/// <summary>
/// Moves <paramref name="dragged"/> to the slot indicated by <paramref name="target"/> /
/// <paramref name="position"/> via <see cref="ICSharpCode.ILSpyX.AssemblyList.Move"/> (the same
/// persistence path as the rest of the app). Returns false if the move isn't valid.
/// </summary>
internal bool ReorderAssemblies ( IReadOnlyList < AssemblyTreeNode > dragged , AssemblyTreeNode target , DropPosition position )
{
if ( ! CanReorder ( dragged , target , position )
| | DataContext is not AssemblyTreeModel model | | model . AssemblyList is not { } list )
return false ;
var ordering = list . GetAssemblies ( ) ;
int targetIndex = Array . IndexOf ( ordering , target . LoadedAssembly ) ;
if ( targetIndex < 0 )
return false ;
int insertIndex = position = = DropPosition . After ? targetIndex + 1 : targetIndex ;
list . Move ( dragged . Select ( n = > n . LoadedAssembly ) . ToArray ( ) , insertIndex ) ;
return true ;
}
internal void HandleFileDrop ( IReadOnlyList < string > files , AssemblyTreeNode ? target , DropPosition position )
{
if ( DataContext is not AssemblyTreeModel model | | model . AssemblyList is not { } list )
return ;
var opened = new List < ICSharpCode . ILSpyX . LoadedAssembly > ( ) ;
foreach ( var path in files )
{
if ( string . IsNullOrEmpty ( path ) )
continue ;
var asm = list . OpenAssembly ( path ) ;
if ( asm ! = null & & ! opened . Contains ( asm ) )
opened . Add ( asm ) ;
}
if ( opened . Count = = 0 )
return ;
if ( target ! = null & & position ! = DropPosition . Append )
{
var ordering = list . GetAssemblies ( ) ;
int targetIndex = Array . IndexOf ( ordering , target . LoadedAssembly ) ;
if ( targetIndex > = 0 )
{
int insertIndex = position = = DropPosition . After ? targetIndex + 1 : targetIndex ;
list . Move ( opened . ToArray ( ) , insertIndex ) ;
}
}
if ( model . Root is not AssemblyListTreeNode listRoot ) if ( model . Root is not AssemblyListTreeNode listRoot )
return ; return ;
var newNodes = opened listRoot . SelectAssembliesAfterDrop = assemblies = > {
. Select ( listRoot . FindAssemblyNode ) var nodes = assemblies
. Where ( n = > n ! = null ) . Select ( listRoot . FindAssemblyNode )
. Cast < SharpTreeNode > ( ) . Where ( n = > n ! = null )
. ToList ( ) ; . Cast < SharpTreeNode > ( )
if ( newNodes . Count = = 0 ) . ToList ( ) ;
return ; if ( nodes . Count = = 0 )
model . SelectedItems . Clear ( ) ; return ;
foreach ( var node in newNodes ) model . SelectedItems . Clear ( ) ;
model . SelectedItems . Add ( node ) ; foreach ( var node in nodes )
model . SelectedItems . Add ( node ) ;
} ;
} }
#endregion
#endregion
internal void OpenNodeInNewTab ( ILSpyTreeNode node ) internal void OpenNodeInNewTab ( ILSpyTreeNode node )
{ {
try try
Siegfried Pammer
1 month ago