Skip to content

G
Gong-Wpf-Dragdrop

jobily / Gong-Wpf-Dragdrop

通知 1
Star 0
Fork 0
G
Gong-Wpf-Dragdrop

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 918ae558 编写于 作者: P punker76
浏览文件
操作

fix: #460 calculate correct size of DropTargetAdorner 

If the ItemsControl has a scrollable content then try to get the viewport width/height to paint the insertion adorner only on this size.
上级 f4689a4a
隐藏空白更改
内联 并排
Showing with 100 addition and 105 deletion
src/GongSolutions.WPF.DragDrop/DropTargetInsertionAdorner.cs
浏览文件 @ 918ae558
...@@ -23,141 +23,136 @@ public DropTargetInsertionAdorner(UIElement adornedElement, DropInfo dropInfo) ...@@ -23,141 +23,136 @@ public DropTargetInsertionAdorner(UIElement adornedElement, DropInfo dropInfo)
protected override void OnRender(DrawingContext drawingContext) protected override void OnRender(DrawingContext drawingContext)
{ {
var dropInfo = this.DropInfo; var dropInfo = this.DropInfo;
var itemsControl = dropInfo.VisualTarget as ItemsControl;
if (itemsControl != null) if (dropInfo.VisualTarget is not ItemsControl itemsControl)
{ {
// Get the position of the item at the insertion index. If the insertion point is return;
// to be after the last item, then get the position of the last item and add an }
// offset later to draw it at the end of the list.
ItemsControl itemParent;
var visualTargetItem = dropInfo.VisualTargetItem; // Get the position of the item at the insertion index. If the insertion point is
if (visualTargetItem != null) // to be after the last item, then get the position of the last item and add an
{ // offset later to draw it at the end of the list.
itemParent = ItemsControl.ItemsControlFromItemContainer(visualTargetItem);
} var visualTargetItem = dropInfo.VisualTargetItem;
else var itemParent = visualTargetItem != null ? ItemsControl.ItemsControlFromItemContainer(visualTargetItem) : itemsControl;
{
itemParent = itemsControl;
}
// this could be happen with a thread scenario where items are removed very quickly // this could be happen with a thread scenario where items are removed very quickly
if (itemParent == null) if (itemParent == null)
{
return;
}
var itemsCount = itemParent.Items.Count;
var index = Math.Min(dropInfo.InsertIndex, itemsCount - 1);
var lastItemInGroup = false;
var targetGroup = dropInfo.TargetGroup;
if (targetGroup != null && targetGroup.IsBottomLevel && dropInfo.InsertPosition.HasFlag(RelativeInsertPosition.AfterTargetItem))
{
var indexOf = targetGroup.Items.IndexOf(dropInfo.TargetItem);
lastItemInGroup = indexOf == targetGroup.ItemCount - 1;
if (lastItemInGroup && dropInfo.InsertIndex != itemsCount)
{ {
return; index--;
} }
}
var itemsCount = itemParent.Items.Count; var itemContainer = (UIElement)itemParent.ItemContainerGenerator.ContainerFromIndex(index);
var index = Math.Min(dropInfo.InsertIndex, itemsCount - 1);
var lastItemInGroup = false; var showAlwaysDropTargetAdorner = itemContainer == null && DragDrop.GetShowAlwaysDropTargetAdorner(itemParent);
var targetGroup = dropInfo.TargetGroup; if (showAlwaysDropTargetAdorner)
if (targetGroup != null && targetGroup.IsBottomLevel && dropInfo.InsertPosition.HasFlag(RelativeInsertPosition.AfterTargetItem)) {
itemContainer = itemParent;
}
if (itemContainer == null)
{
return;
}
var itemRect = new Rect(itemContainer.TranslatePoint(new Point(), this.AdornedElement), itemContainer.RenderSize);
Point point1,
point2;
double rotation = 0;
// If the ItemsControl has a scrollable content then try to get the viewport width/height
// to paint the insertion adorner only on this size.
var viewportWidth = double.MaxValue;
var viewportHeight = double.MaxValue;
if (dropInfo.TargetScrollViewer != null)
{
if (dropInfo.TargetScrollViewer.ScrollableWidth != 0)
{ {
var indexOf = targetGroup.Items.IndexOf(dropInfo.TargetItem); viewportWidth = dropInfo.TargetScrollViewer.ViewportWidth;
lastItemInGroup = indexOf == targetGroup.ItemCount - 1;
if (lastItemInGroup && dropInfo.InsertIndex != itemsCount)
{
index--;
}
} }
var itemContainer = (UIElement)itemParent.ItemContainerGenerator.ContainerFromIndex(index); if (dropInfo.TargetScrollViewer.ScrollableHeight != 0)
var showAlwaysDropTargetAdorner = itemContainer == null && DragDrop.GetShowAlwaysDropTargetAdorner(itemParent);
if (showAlwaysDropTargetAdorner)
{ {
itemContainer = itemParent; viewportHeight = dropInfo.TargetScrollViewer.ViewportHeight;
} }
}
if (itemContainer != null) if (dropInfo.VisualTargetOrientation == Orientation.Vertical)
{
if ((dropInfo.InsertIndex == itemsCount) || lastItemInGroup)
{ {
var itemRect = new Rect(itemContainer.TranslatePoint(new Point(), this.AdornedElement), itemContainer.RenderSize); if (itemsCount > 0)
Point point1,
point2;
double rotation = 0;
// I really don't know why I did this
//
// var viewportWidth = double.MaxValue;
// var viewportHeight = double.MaxValue;
// if (DropInfo.TargetScrollViewer != null)
// {
// if (DropInfo.TargetScrollViewer.ScrollableWidth != 0)
// {
// viewportWidth = DropInfo.TargetScrollViewer.ViewportWidth;
// }
//
// if (DropInfo.TargetScrollViewer.ScrollableHeight != 0)
// {
// viewportHeight = DropInfo.TargetScrollViewer.ViewportHeight;
// }
// }
if (dropInfo.VisualTargetOrientation == Orientation.Vertical)
{ {
if ((dropInfo.InsertIndex == itemsCount) || lastItemInGroup) itemRect.Y += itemContainer.RenderSize.Height;
{
if (itemsCount > 0)
{
itemRect.Y += itemContainer.RenderSize.Height;
}
else
{
if ((itemsControl as ListView)?.View is GridView)
{
var header = itemsControl.GetVisualDescendent<GridViewHeaderRowPresenter>();
if (header != null)
{
itemRect.Y += header.RenderSize.Height;
}
}
else if (itemsControl is DataGrid)
{
var header = itemsControl.GetVisualDescendent<DataGridColumnHeadersPresenter>();
if (header != null)
{
itemRect.Y += header.RenderSize.Height;
}
}
itemRect.Y += this.Pen.Thickness;
}
}
var itemRectRight = itemRect.Right; //Math.Min(itemRect.Right, viewportWidth);
var itemRectLeft = itemRect.X < 0 ? 0 : itemRect.X;
point1 = new Point(itemRectLeft, itemRect.Y);
point2 = new Point(itemRectRight, itemRect.Y);
} }
else else
{ {
if (dropInfo.InsertIndex == itemsCount) if ((itemsControl as ListView)?.View is GridView)
{ {
if (itemsCount > 0) var header = itemsControl.GetVisualDescendent<GridViewHeaderRowPresenter>();
if (header != null)
{ {
itemRect.X += itemContainer.RenderSize.Width; itemRect.Y += header.RenderSize.Height;
} }
else }
else if (itemsControl is DataGrid)
{
var header = itemsControl.GetVisualDescendent<DataGridColumnHeadersPresenter>();
if (header != null)
{ {
itemRect.X += this.Pen.Thickness; itemRect.Y += header.RenderSize.Height;
} }
} }
var itemRectTop = itemRect.Y < 0 ? 0 : itemRect.Y; itemRect.Y += this.Pen.Thickness;
var itemRectBottom = itemRect.Bottom; //Math.Min(itemRect.Bottom, viewportHeight);
point1 = new Point(itemRect.X, itemRectTop);
point2 = new Point(itemRect.X, itemRectBottom);
rotation = 90;
} }
}
drawingContext.DrawLine(this.Pen, point1, point2); var itemRectRight = Math.Min(itemRect.Right, viewportWidth);
this.DrawTriangle(drawingContext, point1, rotation); var itemRectLeft = itemRect.X < 0 ? 0 : itemRect.X;
this.DrawTriangle(drawingContext, point2, 180 + rotation); point1 = new Point(itemRectLeft, itemRect.Y);
point2 = new Point(itemRectRight, itemRect.Y);
}
else
{
if (dropInfo.InsertIndex == itemsCount)
{
if (itemsCount > 0)
{
itemRect.X += itemContainer.RenderSize.Width;
}
else
{
itemRect.X += this.Pen.Thickness;
}
} }
var itemRectTop = itemRect.Y < 0 ? 0 : itemRect.Y;
var itemRectBottom = Math.Min(itemRect.Bottom, viewportHeight);
point1 = new Point(itemRect.X, itemRectTop);
point2 = new Point(itemRect.X, itemRectBottom);
rotation = 90;
} }
drawingContext.DrawLine(this.Pen, point1, point2);
this.DrawTriangle(drawingContext, point1, rotation);
this.DrawTriangle(drawingContext, point2, 180 + rotation);
} }
private void DrawTriangle(DrawingContext drawingContext, Point origin, double rotation) private void DrawTriangle(DrawingContext drawingContext, Point origin, double rotation)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或