Merge branch 'develop' into main

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 3.1.0
+next-version: 3.2.0
 mode: ContinuousDeployment
 branches:
   master:

README.md

@@ -1,5 +1,7 @@
-<div align="center">
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://vshymanskyy.github.io/StandWithUkraine)
 
+<div align="center">
+  <br />
   <a href="https://github.com/punker76/gong-wpf-dragdrop">
     <img alt="gong-wpf-dragdrop" width="700" heigth="142" src="./GongSolutions.Wpf.DragDrop.Full.png">
   </a>
@@ -42,7 +44,6 @@
   </a>
   <br />
   <br />
-
 </div>
 
 ## Features

XamlStyler/Options/XAMLStyler.json → Settings.XAMLStyler

@@ -2,9 +2,9 @@
     "IndentSize": 4,
     "AttributesTolerance": 2,
     "KeepFirstAttributeOnSameLine": true,
-    "MaxAttributeCharatersPerLine": 0,
+    "MaxAttributeCharactersPerLine": 0,
     "MaxAttributesPerLine": 1,
-    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush",
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, MultiTrigger, DataTrigger, MultiDataTrigger, Condition, Setter, SolidColorBrush, Pen",
     "SeparateByGroups": false,
     "AttributeIndentation": 0,
     "AttributeIndentationStyle": 1,
@@ -15,6 +15,7 @@
         "xmlns, xmlns:x",
         "xmlns:*",
         "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "TargetType, BasedOn",
         "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
         "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
         "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",

build.cake

@@ -6,6 +6,7 @@
 #tool dotnet:?package=AzureSignTool&version=3.0.0
 #tool dotnet:?package=GitReleaseManager.Tool&version=0.12.1
 #tool dotnet:?package=GitVersion.Tool&version=5.6.3
+#tool dotnet:?package=XamlStyler.Console&version=3.2008.4
 
 #tool vswhere&version=2.8.4
 #addin nuget:?package=Cake.Figlet&version=2.0.1
@@ -26,6 +27,9 @@ var srcDir = baseDir + "/src";
 var solution = srcDir + "/GongSolutions.WPF.DragDrop.sln";
 var publishDir = baseDir + "/Publish";
 
+var styler = Context.Tools.Resolve("xstyler.exe");
+var stylerFile = baseDir + "/Settings.XAMLStyler";
+
 public class BuildData
 {
     public string Configuration { get; }
@@ -360,6 +364,18 @@ Task("Zip")
     Zip($"./src/Showcase/bin/{data.Configuration}", $"{publishDir}/Showcase.DragDrop.{data.Configuration}-v" + data.GitVersion.NuGetVersion + ".zip");
 });
 
+Task("StyleXaml")
+    .Description("Ensures XAML Formatting is Clean")
+    .Does(() =>
+{
+    Func<IFileSystemInfo, bool> exclude_Dir =
+        fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj");
+
+    var files = GetFiles(srcDir + "/**/*.xaml", new GlobberSettings { Predicate = exclude_Dir });
+    Information("\nChecking " + files.Count() + " file(s) for XAML Structure");
+    StartProcess(styler, "-f \"" + string.Join(",", files.Select(f => f.ToString())) + "\" -c \"" + stylerFile + "\"");
+});
+
 Task("CreateRelease")
     .WithCriteria<BuildData>((context, data) => !data.IsPullRequest)
     .Does<BuildData>(data =>
@@ -386,6 +402,7 @@ Task("CreateRelease")
 Task("Default")
     .IsDependentOn("Clean")
     .IsDependentOn("Restore")
+    .IsDependentOn("StyleXaml")
     .IsDependentOn("Build")
     ;
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
-    "rollForward": "latestFeature"
+    "version": "6.0.300",
+    "rollForward": "feature"
   }
 }

src/GongSolutions.WPF.DragDrop/DefaultDropHandler.cs

@@ -297,7 +297,11 @@ public virtual void Drop(IDropInfo dropInfo)
                     var obj2Insert = o;
                     if (cloneData)
                     {
-                        if (o is ICloneable cloneable)
+                        if (o is ICloneableDragItem cloneableItem)
+                        {
+                            obj2Insert = cloneableItem.CloneItem(dropInfo);
+                        }
+                        else if (o is ICloneable cloneable)
                         {
                             obj2Insert = cloneable.Clone();
                         }
@@ -322,6 +326,11 @@ public virtual void Drop(IDropInfo dropInfo)
                     {
                         destinationList.Insert(insertIndex++, obj2Insert);
                     }
+
+                    if (obj2Insert is IDragItemSource dragItemSource)
+                    {
+                        dragItemSource.ItemDropped(dropInfo);
+                    }
                 }
 
                 SelectDroppedItems(dropInfo, objects2Insert);

src/GongSolutions.WPF.DragDrop/Directory.Build.props

@@ -2,28 +2,29 @@
 
     <!-- SourceLink -->
     <PropertyGroup>
-        <DebugType>portable</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-
         <!-- Optional: Declare that the Repository URL can be published to NuSpec -->
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
         <!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <!-- By using EmbedAllSources we don't need SourceLink itself -->
+        <!-- https://github.com/dotnet/sourcelink/blob/master/docs/README.md#embedallsources -->
+        <EmbedAllSources>true</EmbedAllSources>
+    </PropertyGroup>
 
-        <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <!-- PDB-Options -->
+    <PropertyGroup>
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>Embedded</DebugType>
     </PropertyGroup>
 
     <!-- reference includes -->
-    <ItemGroup>
+<!--     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-
+ -->
     <ItemGroup>
         <SourceRoot Include="$(NuGetPackageRoot)" Condition="'$(NuGetPackageRoot)' != ''" />
     </ItemGroup>

src/GongSolutions.WPF.DragDrop/DragDrop.cs

@@ -474,7 +474,7 @@ private static void DragSourceDown(object sender, DragInfo dragInfo, InputEventA
             // already selected item does not change the selection, otherwise dragging multiple items 
             // is made impossible.
             if ((Keyboard.Modifiers & ModifierKeys.Shift) == 0
-                && (Keyboard.Modifiers & ModifierKeys.Control) == 0
+                //&& (Keyboard.Modifiers & ModifierKeys.Control) == 0 // #432
                 && dragInfo.VisualSourceItem != null
                 && sender is ItemsControl itemsControl
                 && itemsControl.CanSelectMultipleItems())
@@ -627,8 +627,6 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
                                 dataObject = new DataObject(dragInfo.DataFormat.Name, dragInfo.Data);
                             }
 
-                            var hookId = IntPtr.Zero;
-
                             try
                             {
                                 _dragInProgress = true;
@@ -639,10 +637,17 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
                                     DragDropPreview?.Move(getPosition(DragDropPreview.PlacementTarget));
                                 }
 
-                                hookId = MouseHelper.HookMouseMove(point =>
+                                MouseHelper.HookMouseMove(point =>
                                     {
-                                        DragDropPreview?.Move(CursorHelper.GetCurrentCursorPosition(DragDropPreview.PlacementTarget, point));
-                                        DragDropEffectPreview?.Move(CursorHelper.GetCurrentCursorPosition(DragDropEffectPreview.PlacementTarget, point));
+                                        if (DragDropPreview?.PlacementTarget != null)
+                                        {
+                                            DragDropPreview.Move(DragDropPreview.PlacementTarget.PointFromScreen(point));
+                                        }
+
+                                        if (DragDropEffectPreview?.PlacementTarget != null)
+                                        {
+                                            DragDropEffectPreview.Move(DragDropEffectPreview.PlacementTarget.PointFromScreen(point));
+                                        }
                                     });
 
                                 var dragDropHandler = dragInfo.DragDropHandler ?? System.Windows.DragDrop.DoDragDrop;
@@ -663,7 +668,7 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
                             }
                             finally
                             {
-                                MouseHelper.RemoveHook(hookId);
+                                MouseHelper.UnHook();
                                 _dragInProgress = false;
                                 _dragInfo = null;
                             }