Merge pull request #405 from vadzimshch/fix404

punker76 · web-flow · commit 3dc6e0da6060 · 2021-10-08T18:37:59.000+02:00
Fix for #404
diff --git a/src/GongSolutions.WPF.DragDrop/DropInfo.cs b/src/GongSolutions.WPF.DragDrop/DropInfo.cs
@@ -179,7 +179,8 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E
 
                             this.InsertPosition |= RelativeInsertPosition.TargetItemCenter;
                         }
-                        //System.Diagnostics.Debug.WriteLine("==> DropInfo: pos={0}, idx={1}, Y={2}, Item={3}", this.InsertPosition, this.InsertIndex, currentYPos, item);
+
+                        // System.Diagnostics.Debug.WriteLine($"==> DropInfo: pos={this.InsertPosition}, index={this.InsertIndex}, currentXPos={currentXPos}, Item={this.item}");
                     }
                     else
                     {
@@ -188,7 +189,7 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E
 
                         if (this.VisualTargetFlowDirection == FlowDirection.RightToLeft)
                         {
-                            if (currentXPos > targetWidth / 2)
+                            if (currentXPos < targetWidth / 2)
                             {
                                 this.InsertPosition = RelativeInsertPosition.BeforeTargetItem;
                             }
@@ -221,7 +222,8 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E
 
                             this.InsertPosition |= RelativeInsertPosition.TargetItemCenter;
                         }
-                        //System.Diagnostics.Debug.WriteLine("==> DropInfo: pos={0}, idx={1}, X={2}, Item={3}", this.InsertPosition, this.InsertIndex, currentXPos, item);
+
+                        // System.Diagnostics.Debug.WriteLine($"==> DropInfo: pos={this.InsertPosition}, index={this.InsertIndex}, currentXPos={currentXPos}, Item={this.item}");
                     }
                 }
                 else
diff --git a/src/GongSolutions.WPF.DragDrop/DropTargetInsertionAdorner.cs b/src/GongSolutions.WPF.DragDrop/DropTargetInsertionAdorner.cs
@@ -133,18 +133,7 @@ protected override void OnRender(DrawingContext drawingContext)
                     }
                     else
                     {
-                        if (dropInfo.VisualTargetFlowDirection == FlowDirection.LeftToRight && dropInfo.InsertIndex == itemsCount)
-                        {
-                            if (itemsCount > 0)
-                            {
-                                itemRect.X += itemContainer.RenderSize.Width;
-                            }
-                            else
-                            {
-                                itemRect.X += this.Pen.Thickness;
-                            }
-                        }
-                        else if (dropInfo.VisualTargetFlowDirection == FlowDirection.RightToLeft && dropInfo.InsertIndex != itemsCount)
+                        if (dropInfo.InsertIndex == itemsCount)
                         {
                             if (itemsCount > 0)
                             {
diff --git a/src/GongSolutions.WPF.DragDrop/Utilities/DragDropExtensions.cs b/src/GongSolutions.WPF.DragDrop/Utilities/DragDropExtensions.cs
@@ -127,7 +127,7 @@ private static BitmapSource CaptureScreen(Visual target, FlowDirection flowDirec
                 {
                     var transformGroup = new TransformGroup();
                     transformGroup.Children.Add(new ScaleTransform(-1, 1));
-                    transformGroup.Children.Add(new TranslateTransform(bounds.Size.Width - 1, 0));
+                    transformGroup.Children.Add(new TranslateTransform(bounds.Size.Width, 0));
                     ctx.PushTransform(transformGroup);
                 }
 
diff --git a/src/Showcase/Views/ListBoxSamples.xaml b/src/Showcase/Views/ListBoxSamples.xaml
@@ -123,11 +123,36 @@
                         <StackPanel>
                             <TextBlock Style="{StaticResource DefaultTextBlockStyle}" Text="Demonstrates the default behaviour with horizontal ListBoxes and right to left flow direction." />
                             <TextBlock Style="{StaticResource DefaultTextBlockStyle}" Text="Unbound ListBox" />
-                            <ListBox Height="Auto"
+                            <ListBox MinHeight="30"
+                                     Height="Auto"
+                                     dd:DragDrop.DefaultDragAdornerOpacity="0.5"
+                                     dd:DragDrop.IsDragSource="True"
+                                     dd:DragDrop.IsDropTarget="True"
+                                     dd:DragDrop.UseDefaultDragAdorner="True"
+                                     dd:DragDrop.UseDefaultEffectDataTemplate="True"
+                                     dd:DragDrop.ShowAlwaysDropTargetAdorner="True"
+                                     SelectionMode="Extended">
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Margin="1" Orientation="Horizontal" />
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
+                                <ListBoxItem>ListBoxItem1</ListBoxItem>
+                                <ListBoxItem>ListBoxItem2</ListBoxItem>
+                                <ListBoxItem>ListBoxItem3</ListBoxItem>
+                                <ListBoxItem>ListBoxItem4</ListBoxItem>
+                                <ListBoxItem>ListBoxItem5</ListBoxItem>
+                            </ListBox>
+                            <TextBlock Style="{StaticResource DefaultTextBlockStyle}" Text="ListBox with right to left flow direction" />
+                            <ListBox MinHeight="30"
+                                     Height="Auto"
+                                     FlowDirection="RightToLeft"
                                      dd:DragDrop.DefaultDragAdornerOpacity="0.5"
                                      dd:DragDrop.IsDragSource="True"
                                      dd:DragDrop.IsDropTarget="True"
                                      dd:DragDrop.UseDefaultDragAdorner="True"
+                                     dd:DragDrop.UseDefaultEffectDataTemplate="True"
+                                     dd:DragDrop.ShowAlwaysDropTargetAdorner="True"
                                      SelectionMode="Extended">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,8 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E`
`179`	`179`
`180`	`180`	`this.InsertPosition \|= RelativeInsertPosition.TargetItemCenter;`
`181`	`181`	`}`
`182`		`- //System.Diagnostics.Debug.WriteLine("==> DropInfo: pos={0}, idx={1}, Y={2}, Item={3}", this.InsertPosition, this.InsertIndex, currentYPos, item);`
	`182`	`+`
	`183`	`+ // System.Diagnostics.Debug.WriteLine($"==> DropInfo: pos={this.InsertPosition}, index={this.InsertIndex}, currentXPos={currentXPos}, Item={this.item}");`
`183`	`184`	`}`
`184`	`185`	`else`
`185`	`186`	`{`
`@@ -188,7 +189,7 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E`
`188`	`189`
`189`	`190`	`if (this.VisualTargetFlowDirection == FlowDirection.RightToLeft)`
`190`	`191`	`{`
`191`		`- if (currentXPos > targetWidth / 2)`
	`192`	`+ if (currentXPos < targetWidth / 2)`
`192`	`193`	`{`
`193`	`194`	`this.InsertPosition = RelativeInsertPosition.BeforeTargetItem;`
`194`	`195`	`}`
`@@ -221,7 +222,8 @@ public DropInfo(object sender, DragEventArgs e, [CanBeNull] DragInfo dragInfo, E`
`221`	`222`
`222`	`223`	`this.InsertPosition \|= RelativeInsertPosition.TargetItemCenter;`
`223`	`224`	`}`
`224`		`- //System.Diagnostics.Debug.WriteLine("==> DropInfo: pos={0}, idx={1}, X={2}, Item={3}", this.InsertPosition, this.InsertIndex, currentXPos, item);`
	`225`	`+`
	`226`	`+ // System.Diagnostics.Debug.WriteLine($"==> DropInfo: pos={this.InsertPosition}, index={this.InsertIndex}, currentXPos={currentXPos}, Item={this.item}");`
`225`	`227`	`}`
`226`	`228`	`}`
`227`	`229`	`else`
Original file line number	Diff line number	Diff line change
`@@ -133,18 +133,7 @@ protected override void OnRender(DrawingContext drawingContext)`
`133`	`133`	`}`
`134`	`134`	`else`
`135`	`135`	`{`
`136`		`- if (dropInfo.VisualTargetFlowDirection == FlowDirection.LeftToRight && dropInfo.InsertIndex == itemsCount)`
`137`		`- {`
`138`		`- if (itemsCount > 0)`
`139`		`- {`
`140`		`- itemRect.X += itemContainer.RenderSize.Width;`
`141`		`- }`
`142`		`- else`
`143`		`- {`
`144`		`- itemRect.X += this.Pen.Thickness;`
`145`		`- }`
`146`		`- }`
`147`		`- else if (dropInfo.VisualTargetFlowDirection == FlowDirection.RightToLeft && dropInfo.InsertIndex != itemsCount)`
	`136`	`+ if (dropInfo.InsertIndex == itemsCount)`
`148`	`137`	`{`
`149`	`138`	`if (itemsCount > 0)`
`150`	`139`	`{`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ private static BitmapSource CaptureScreen(Visual target, FlowDirection flowDirec`
`127`	`127`	`{`
`128`	`128`	`var transformGroup = new TransformGroup();`
`129`	`129`	`transformGroup.Children.Add(new ScaleTransform(-1, 1));`
`130`		`- transformGroup.Children.Add(new TranslateTransform(bounds.Size.Width - 1, 0));`
	`130`	`+ transformGroup.Children.Add(new TranslateTransform(bounds.Size.Width, 0));`
`131`	`131`	`ctx.PushTransform(transformGroup);`
`132`	`132`	`}`
`133`	`133`