summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-04-29 01:04:55 +0000
committersr55 <[email protected]>2012-04-29 01:04:55 +0000
commit247470bf6e6b0582cbedbc05bca11a67b973d7c1 (patch)
tree8737217227dcb4fe44bbf0eb47b8434377d6a904
parentc412ca81dd55d568c362ddef07de52dab90fcf4d (diff)
WinGui (WPF) Fix a bug in the GongSolutions WPF Drag/Drop Library to prevent a crash with dropdowns when clicking an item outside of the listbox control area.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4613 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML305
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dllbin29184 -> 31232 bytes
-rw-r--r--win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdbbin0 -> 77312 bytes
3 files changed, 286 insertions, 19 deletions
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
index 8270f7326..6d3ed76fe 100644
--- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML
@@ -4,34 +4,100 @@
<name>GongSolutions.Wpf.DragDrop</name>
</assembly>
<members>
- <member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.Data">
<summary>
- Interface implemented by Drop Handlers.
+ Gets the drag data.
</summary>
+
+ <remarks>
+ If the drag came from within the framework, this will hold:
+
+ - The dragged data if a single item was dragged.
+ - A typed IEnumerable if multiple items were dragged.
+ </remarks>
</member>
- <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DragInfo">
<summary>
- Updates the current drag state.
+ Gets a <see cref="P:GongSolutions.Wpf.DragDrop.IDropInfo.DragInfo"/> object holding information about the source of the drag,
+ if the drag came from within the framework.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DropPosition">
+ <summary>
+ Gets the mouse position relative to the VisualTarget
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.DropTargetAdorner">
+ <summary>
+ Gets or sets the class of drop target to display.
</summary>
- <param name="dropInfo">
- Information about the drag.
- </param>
+ <remarks>
+ The standard drop target adorner classes are held in the <see cref="T:GongSolutions.Wpf.DragDrop.DropTargetAdorners"/>
+ class.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.Effects">
+ <summary>
+ Gets or sets the allowed effects for the drop.
+ </summary>
<remarks>
- To allow a drop at the current drag position, the <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects"/> property on
- <paramref name="dropInfo"/> should be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/>
- and <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Data"/> should be set to a non-null value.
+ This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drop handler in order
+ for a drop to be possible.
</remarks>
</member>
- <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)">
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.InsertIndex">
<summary>
- Performs a drop.
+ Gets the current insert position within <see cref="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetCollection"/>.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetCollection">
+ <summary>
+ Gets the collection that the target ItemsControl is bound to.
</summary>
- <param name="dropInfo">
- Information about the drop.
- </param>
+ <remarks>
+ If the current drop target is unbound or not an ItemsControl, this will be null.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetItem">
+ <summary>
+ Gets the object that the current drop target is bound to.
+ </summary>
+
+ <remarks>
+ If the current drop target is unbound or not an ItemsControl, this will be null.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.TargetGroup">
+ <summary>
+ Gets the current group target.
+ </summary>
+
+ <remarks>
+ If the drag is currently over an ItemsControl with groups, describes the group that
+ the drag is currently over.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTarget">
+ <summary>
+ Gets the control that is the current drop target.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTargetItem">
+ <summary>
+ Gets the item in an ItemsControl that is the current drop target.
+ </summary>
+
+ <remarks>
+ If the current drop target is unbound or not an ItemsControl, this will be null.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDropInfo.VisualTargetOrientation">
+ <summary>
+ Gets th orientation of the current drop target.
+ </summary>
</member>
<member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
<summary>
@@ -40,8 +106,8 @@
<remarks>
The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current
- target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)"/> method to determine whether
- the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)"/> to perform the drop.
+ target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)"/> method to determine whether
+ the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)"/> to perform the drop.
</remarks>
</member>
<member name="M:GongSolutions.Wpf.DragDrop.DropInfo.#ctor(System.Object,System.Windows.DragEventArgs,GongSolutions.Wpf.DragDrop.DragInfo)">
@@ -79,6 +145,11 @@
if the drag came from within the framework.
</summary>
</member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropPosition">
+ <summary>
+ Gets the mouse position relative to the VisualTarget
+ </summary>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropTargetAdorner">
<summary>
Gets or sets the class of drop target to display.
@@ -151,12 +222,127 @@
Gets th orientation of the current drop target.
</summary>
</member>
+ <member name="T:GongSolutions.Wpf.DragDrop.DragAdorner">
+ <summary>
+ The drag adorner.
+ </summary>
+ </member>
+ <member name="F:GongSolutions.Wpf.DragDrop.DragAdorner.m_AdornerLayer">
+ <summary>
+ The m_ adorner layer.
+ </summary>
+ </member>
+ <member name="F:GongSolutions.Wpf.DragDrop.DragAdorner.m_Adornment">
+ <summary>
+ The m_ adornment.
+ </summary>
+ </member>
+ <member name="F:GongSolutions.Wpf.DragDrop.DragAdorner.m_MousePosition">
+ <summary>
+ The m_ mouse position.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.#ctor(System.Windows.UIElement,System.Windows.UIElement)">
+ <summary>
+ Initializes a new instance of the <see cref="T:GongSolutions.Wpf.DragDrop.DragAdorner"/> class.
+ </summary>
+ <param name="adornedElement">
+ The adorned element.
+ </param>
+ <param name="adornment">
+ The adornment.
+ </param>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.Detatch">
+ <summary>
+ The detatch.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.GetDesiredTransform(System.Windows.Media.GeneralTransform)">
+ <summary>
+ The get desired transform.
+ </summary>
+ <param name="transform">
+ The transform.
+ </param>
+ <returns>
+ </returns>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.ArrangeOverride(System.Windows.Size)">
+ <summary>
+ The arrange override.
+ </summary>
+ <param name="finalSize">
+ The final size.
+ </param>
+ <returns>
+ </returns>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.GetVisualChild(System.Int32)">
+ <summary>
+ The get visual child.
+ </summary>
+ <param name="index">
+ The index.
+ </param>
+ <returns>
+ </returns>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragAdorner.MeasureOverride(System.Windows.Size)">
+ <summary>
+ The measure override.
+ </summary>
+ <param name="constraint">
+ The constraint.
+ </param>
+ <returns>
+ </returns>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DragAdorner.MousePosition">
+ <summary>
+ Gets or sets MousePosition.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DragAdorner.VisualChildrenCount">
+ <summary>
+ Gets VisualChildrenCount.
+ </summary>
+ </member>
+ <member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
+ <summary>
+ Interface implemented by Drop Handlers.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.IDropInfo)">
+ <summary>
+ Updates the current drag state.
+ </summary>
+
+ <param name="dropInfo">
+ Information about the drag.
+ </param>
+
+ <remarks>
+ To allow a drop at the current drag position, the <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects"/> property on
+ <paramref name="dropInfo"/> should be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/>
+ and <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Data"/> should be set to a non-null value.
+ </remarks>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.IDropInfo)">
+ <summary>
+ Performs a drop.
+ </summary>
+
+ <param name="dropInfo">
+ Information about the drop.
+ </param>
+ </member>
<member name="T:GongSolutions.Wpf.DragDrop.IDragSource">
<summary>
Interface implemented by Drag Handlers.
</summary>
</member>
- <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)">
+ <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)">
<summary>
Queries whether a drag can be started.
</summary>
@@ -170,6 +356,87 @@
should be set to a value other than <see cref="!:DragDropEffects.None"/>.
</remarks>
</member>
+ <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.Dropped(GongSolutions.Wpf.DragDrop.IDropInfo)">
+ <summary>
+ Notifies the drag handler that a drop has occurred.
+ </summary>
+
+ <param name="dropInfo">
+ Information about the drop.
+ </param>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Data">
+ <summary>
+ Gets or sets the drag data.
+ </summary>
+
+ <remarks>
+ This must be set by a drag handler in order for a drag to start.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DragStartPosition">
+ <summary>
+ Gets the position of the click that initiated the drag, relative to <see cref="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource"/>.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Effects">
+ <summary>
+ Gets or sets the allowed effects for the drag.
+ </summary>
+
+ <remarks>
+ This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drag handler in order
+ for a drag to start.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.MouseButton">
+ <summary>
+ Gets the mouse button that initiated the drag.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceCollection">
+ <summary>
+ Gets the collection that the source ItemsControl is bound to.
+ </summary>
+
+ <remarks>
+ If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItem">
+ <summary>
+ Gets the object that a dragged item is bound to.
+ </summary>
+
+ <remarks>
+ If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItems">
+ <summary>
+ Gets a collection of objects that the selected items in an ItemsControl are bound to.
+ </summary>
+
+ <remarks>
+ If the control that initated the drag is unbound or not an ItemsControl, this will be empty.
+ </remarks>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource">
+ <summary>
+ Gets the control that initiated the drag.
+ </summary>
+ </member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSourceItem">
+ <summary>
+ Gets the item in an ItemsControl that started the drag.
+ </summary>
+
+ <remarks>
+ If the control that initiated the drag is an ItemsControl, this property will hold the item
+ container of the clicked item. For example, if <see cref="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSource"/> is a ListBox this
+ will hold a ListBoxItem.
+ </remarks>
+ </member>
<member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
<summary>
Holds information about a the source of a drag drop operation.
@@ -177,7 +444,7 @@
<remarks>
The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
- of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)"/> to determine whether a drag
+ of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)"/> to determine whether a drag
can start, and what the dragged data should be.
</remarks>
</member>
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
index 237a45c09..f4925187d 100644
--- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll
Binary files differ
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
new file mode 100644
index 000000000..5015d297b
--- /dev/null
+++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb
Binary files differ