Merge branch 'develop' into main

punker76 · Jan 29, 2022 · e488256 · e488256
2 parents 846ae11 + e530db3
commit e488256
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 3.0.0
+next-version: 3.1.0
 mode: ContinuousDeployment
 branches:
   master:

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
     An easy to use drag'n'drop framework for WPF.
   </p>
   <p>
-    Supporting .NET Framework 4.5.2+, .NET Core 3.1, .NET 5 and .NET 6 (on Windows)
+    Supporting .NET Framework 4.6.2+, .NET Core 3.1, .NET 5 and .NET 6 (on Windows)
   </p>
 
   <a href="https://gitter.im/punker76/gong-wpf-dragdrop">

diff --git a/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs b/src/GongSolutions.WPF.DragDrop/DragDrop.Properties.cs
@@ -571,6 +571,35 @@ public static void SetDropTargetAdornerBrush(DependencyObject element, Brush val
             element.SetValue(DropTargetAdornerBrushProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the pen for the DropTargetAdorner.
+        /// </summary>
+        public static readonly DependencyProperty DropTargetAdornerPenProperty
+            = DependencyProperty.RegisterAttached("DropTargetAdornerPen",
+                                                  typeof(Pen),
+                                                  typeof(DragDrop),
+                                                  new PropertyMetadata((Pen)null));
+
+        /// <summary>Helper for getting <see cref="DropTargetAdornerPenProperty"/> from <paramref name="element"/>.</summary>
+        /// <param name="element"><see cref="DependencyObject"/> to read <see cref="DropTargetAdornerPenProperty"/> from.</param>
+        /// <remarks>Gets the pen for the DropTargetAdorner.</remarks>
+        /// <returns>DropTargetAdornerPen property value.</returns>
+        [AttachedPropertyBrowsableForType(typeof(UIElement))]
+        public static Pen GetDropTargetAdornerPen(DependencyObject element)
+        {
+            return (Pen)element.GetValue(DropTargetAdornerPenProperty);
+        }
+
+        /// <summary>Helper for setting <see cref="DropTargetAdornerPenProperty"/> on <paramref name="element"/>.</summary>
+        /// <param name="element"><see cref="DependencyObject"/> to set <see cref="DropTargetAdornerPenProperty"/> on.</param>
+        /// <param name="value">DropTargetAdornerPen property value.</param>
+        /// <remarks>Sets the pen for the DropTargetAdorner.</remarks>
+        [AttachedPropertyBrowsableForType(typeof(UIElement))]
+        public static void SetDropTargetAdornerPen(DependencyObject element, Pen value)
+        {
+            element.SetValue(DropTargetAdornerPenProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets a context for a control. Only controls with the same context are allowed for drag or drop actions.
         /// </summary>

diff --git a/src/GongSolutions.WPF.DragDrop/DragDrop.cs b/src/GongSolutions.WPF.DragDrop/DragDrop.cs
@@ -675,7 +675,7 @@ private static void DoDragSourceMove(object sender, Func<IInputElement, Point> g
 
         private static void DragSourceOnQueryContinueDrag(object sender, QueryContinueDragEventArgs e)
         {
-            if (e.Action == DragAction.Cancel || e.EscapePressed || (e.KeyStates.HasFlag(DragDropKeyStates.LeftMouseButton) == false && e.KeyStates.HasFlag(DragDropKeyStates.RightMouseButton) == false))
+            if (e.Action == DragAction.Cancel || e.EscapePressed || (e.KeyStates.HasFlag(DragDropKeyStates.LeftMouseButton) == e.KeyStates.HasFlag(DragDropKeyStates.RightMouseButton)))
             {
                 DragDropPreview = null;
                 DragDropEffectPreview = null;
@@ -816,10 +816,18 @@ private static void DropTargetOnDragOver(object sender, DragEventArgs e, EventTy
                     var adorner = DropTargetAdorner;
                     if (adorner != null)
                     {
-                        var adornerBrush = GetDropTargetAdornerBrush(dropInfo.VisualTarget);
-                        if (adornerBrush != null)
+                        var adornerPen = GetDropTargetAdornerPen(dropInfo.VisualTarget);
+                        if (adornerPen != null)
                         {
-                            adorner.Pen.SetCurrentValue(Pen.BrushProperty, adornerBrush);
+                            adorner.Pen = adornerPen;
+                        }
+                        else
+                        {
+                            var adornerBrush = GetDropTargetAdornerBrush(dropInfo.VisualTarget);
+                            if (adornerBrush != null)
+                            {
+                                adorner.Pen.SetCurrentValue(Pen.BrushProperty, adornerBrush);
+                            }
                         }
 
                         adorner.DropInfo = dropInfo;