diff options
author | sr55 <[email protected]> | 2014-08-28 11:00:41 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2014-08-28 11:00:41 +0000 |
commit | 659a0ccfc020abb0b7032a113112d52a31ce2abf (patch) | |
tree | d3aa32fb218de7954c0cd120698e9bbdcdac3a80 /win | |
parent | 57be086c0c20d74374c384e9e85303baf28e3abb (diff) |
WinGui: Update the Gong WPF Drag/Drop library. This fixes a few issues with the moving/ordering of Audio/Subtitle and Queue items.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6379 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r-- | win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML | 108 | ||||
-rw-r--r-- | win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll | bin | 50176 -> 54272 bytes | |||
-rw-r--r-- | win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb | bin | 89600 -> 95744 bytes | |||
-rw-r--r-- | win/CS/libraries/WPFDragDrop/notes.txt | 2 |
4 files changed, 87 insertions, 23 deletions
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML index e46d7093d..c05cddd5c 100644 --- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML +++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML @@ -20,9 +20,10 @@ <remarks>
To allow a drag to be started, the <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects"/> property on <paramref name="dragInfo"/>
- should be set to a value other than <see cref="!:DragDropEffects.None"/>.
+ should be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/>.
</remarks>
</member>
+ <!-- Badly formed XML comment ignored for member "M:GongSolutions.Wpf.DragDrop.IDragSource.CanStartDrag(GongSolutions.Wpf.DragDrop.IDragInfo)" -->
<member name="M:GongSolutions.Wpf.DragDrop.IDragSource.Dropped(GongSolutions.Wpf.DragDrop.IDropInfo)">
<summary>
Notifies the drag handler that a drop has occurred.
@@ -32,6 +33,11 @@ Information about the drop.
</param>
</member>
+ <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.DragCancelled">
+ <summary>
+ Notifies the drag handler that a drag has been aborted.
+ </summary>
+ </member>
<member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
<summary>
Interface implemented by Drop Handlers.
@@ -61,6 +67,38 @@ Information about the drop.
</param>
</member>
+ <member name="F:GongSolutions.Wpf.DragDrop.DragDrop.DragMouseAnchorPointProperty">
+ <summary>
+ DragMouseAnchorPoint defines the horizontal and vertical proportion at which the pointer will anchor on the DragAdorner.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragDrop.TryGetDragHandler(GongSolutions.Wpf.DragDrop.DragInfo,System.Windows.UIElement)">
+ <summary>
+ Gets the drag handler from the drag info or from the sender, if the drag info is null
+ </summary>
+ <param name="dragInfo">the drag info object</param>
+ <param name="sender">the sender from an event, e.g. mouse down, mouse move</param>
+ <returns></returns>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.DragDrop.TryGetDropHandler(GongSolutions.Wpf.DragDrop.DropInfo,System.Windows.UIElement)">
+ <summary>
+ Gets the drop handler from the drop info or from the sender, if the drop info is null
+ </summary>
+ <param name="dropInfo">the drop info object</param>
+ <param name="sender">the sender from an event, e.g. drag over</param>
+ <returns></returns>
+ </member>
+ <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+ <summary>
+ Holds information about a the source of a drag drop operation.
+ </summary>
+
+ <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.IDragInfo)"/> to determine whether a drag
+ can start, and what the dragged data should be.
+ </remarks>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.Data">
<summary>
Gets or sets the drag data.
@@ -104,6 +142,11 @@ 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.SourceIndex">
+ <summary>
+ Gets the position from where the item was dragged.
+ </summary>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.SourceItem">
<summary>
Gets the object that a dragged item is bound to.
@@ -138,23 +181,17 @@ will hold a ListBoxItem.
</remarks>
</member>
+ <member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.VisualSourceFlowDirection">
+ <summary>
+ Gets the FlowDirection of the current drag source.
+ </summary>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.IDragInfo.DataObject">
<summary>
Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
a custom instance if custom drag and drop behavior is needed.
</summary>
</member>
- <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
- <summary>
- Holds information about a the source of a drag drop operation.
- </summary>
-
- <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.IDragInfo)"/> to determine whether a drag
- can start, and what the dragged data should be.
- </remarks>
- </member>
<member name="M:GongSolutions.Wpf.DragDrop.DragInfo.#ctor(System.Object,System.Windows.Input.MouseButtonEventArgs)">
<summary>
Initializes a new instance of the DragInfo class.
@@ -211,6 +248,12 @@ 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.DragInfo.SourceIndex">
+ <summary>
+ Gets the position from where the item was dragged.
+ </summary>
+ <value>The index of the source.</value>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItem">
<summary>
Gets the object that a dragged item is bound to.
@@ -245,12 +288,28 @@ will hold a ListBoxItem.
</remarks>
</member>
+ <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSourceFlowDirection">
+ <summary>
+ Gets the FlowDirection of the current drag source.
+ </summary>
+ </member>
<member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DataObject">
<summary>
Gets the <see cref="T:System.Windows.IDataObject"/> which is used by the drag and drop operation. Set it to
a custom instance if custom drag and drop behavior is needed.
</summary>
</member>
+ <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+ <summary>
+ Holds information about a the target of a drag drop operation.
+ </summary>
+
+ <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.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="P:GongSolutions.Wpf.DragDrop.IDropInfo.Data">
<summary>
Gets the drag data.
@@ -371,17 +430,6 @@ Indicates if the drop info should be handled by itself (useful for child elements)
</summary>
</member>
- <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
- <summary>
- Holds information about a the target of a drag drop operation.
- </summary>
-
- <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.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)">
<summary>
Initializes a new instance of the DropInfo class.
@@ -528,5 +576,19 @@ <param name="size">The size of the icon</param>
<returns>The image to be displayed</returns>
</member>
+ <member name="M:GongSolutions.Wpf.DragDrop.Utilities.HitTestUtilities.IsNotPartOfSender(System.Object,System.Windows.Input.MouseButtonEventArgs)">
+ <summary>
+ thx to @osicka from issue #84
+
+ e.g. original source is part of a popup (e.g. ComboBox drop down), the hit test needs to be done on the original source.
+ Because the popup is not attached to the visual tree of the sender.
+ This function test this by looping back from the original source to the sender and if it didn't end up at the sender stopped the drag.
+ </summary>
+ </member>
+ <member name="M:GongSolutions.Wpf.DragDrop.Utilities.VisualTreeExtensions.GetVisualAncestor(System.Windows.DependencyObject,System.Type,System.Windows.Controls.ItemsControl)">
+ <summary>
+ find the visual ancestor by type and go through the visual tree until the given itemsControl will be found
+ </summary>
+ </member>
</members>
</doc>
diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll Binary files differindex 395aac56d..bf2d85e9f 100644 --- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll +++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll diff --git a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb Binary files differindex 5b01a61e8..121c34de7 100644 --- a/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb +++ b/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.pdb diff --git a/win/CS/libraries/WPFDragDrop/notes.txt b/win/CS/libraries/WPFDragDrop/notes.txt index 4d3071ad0..a40a2f0c6 100644 --- a/win/CS/libraries/WPFDragDrop/notes.txt +++ b/win/CS/libraries/WPFDragDrop/notes.txt @@ -1 +1,3 @@ https://github.com/punker76/gong-wpf-dragdrop
+
+[New BSD License](http://opensource.org/licenses/BSD-3-Clause) |