Handle drop to sidebar and pathbar

Author: gave92

src/Files.App/Helpers/AutomaticDragHelper.cs

@@ -13,6 +13,7 @@
 
 namespace Files.App.Helpers
 {
+	// https://github.com/microsoft/microsoft-ui-xaml/blob/winui3/release/1.6.3/src/dxaml/xcp/dxaml/lib/AutomaticDragHelper.cpp
 	public class AutomaticDragHelper : DependencyObject
 	{
 		public static AutomaticDragHelper GetDragHelper(DependencyObject obj)
@@ -125,10 +126,6 @@ public void RegisterDragPointerEvents()
 		{
 			if (m_shouldAddInputHandlers)
 			{
-				PointerEventHandler spDragDropPointerMovedHandler;
-				PointerEventHandler spDragDropPointerReleasedHandler;
-				PointerEventHandler spDragDropPointerCaptureLostHandler;
-
 				// Hookup pointer events so we can catch and handle it for drag and drop.
 				if (!m_dragDropPointerMovedToken)
 				{

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -11,11 +11,13 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Windows.Input;
+using Vanara.PInvoke;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.ApplicationModel.DataTransfer.DragDrop;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
+using WinRT;
 
 namespace Files.App.ViewModels.UserControls
 {
@@ -1251,6 +1253,16 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 							await QuickAccessService.PinToSidebarAsync(item.Path);
 					}
 				}
+				else if ((bool)args.DroppedItem.Properties.GetValueOrDefault("dragRightButton", false))
+				{
+					Windows.Win32.PInvoke.GetCursorPos(out var dropPoint);
+					using var sf = new Vanara.Windows.Shell.ShellFolder(locationItem.Path);
+					var dataObjectProvider = args.DroppedItem.As<Shell32.IDataObjectProvider>();
+					var iddo = dataObjectProvider.GetDataObject();
+					var dropTarget = sf.GetViewObject<Ole32.IDropTarget>(HWND.NULL);
+					dropTarget.DragEnter(iddo, Vanara.PInvoke.MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)args.RawEvent.AcceptedOperation);
+					dropTarget.Drop(iddo, Vanara.PInvoke.MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)args.RawEvent.AcceptedOperation);
+				}
 				else
 				{
 					await FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.DroppedItem, locationItem.Path, false, true);
@@ -1260,7 +1272,21 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 
 		private Task<ReturnResult> HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)
 		{
-			return FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, driveItem.Path, false, true);
+			if ((bool)args.DroppedItem.Properties.GetValueOrDefault("dragRightButton", false))
+			{
+				Windows.Win32.PInvoke.GetCursorPos(out var dropPoint);
+				using var sf = new Vanara.Windows.Shell.ShellFolder(driveItem.Path);
+				var dataObjectProvider = args.DroppedItem.As<Shell32.IDataObjectProvider>();
+				var iddo = dataObjectProvider.GetDataObject();
+				var dropTarget = sf.GetViewObject<Ole32.IDropTarget>(HWND.NULL);
+				dropTarget.DragEnter(iddo, Vanara.PInvoke.MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)args.RawEvent.AcceptedOperation);
+				dropTarget.Drop(iddo, Vanara.PInvoke.MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)args.RawEvent.AcceptedOperation);
+				return Task.FromResult(ReturnResult.Success);
+			}
+			else
+			{
+				return FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, driveItem.Path, false, true);
+			}
 		}
 
 		private async Task HandleTagItemDroppedAsync(FileTagItem fileTagItem, ItemDroppedEventArgs args)

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -9,9 +9,11 @@
 using Microsoft.UI.Xaml.Navigation;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Vanara.PInvoke;
 using Windows.Foundation.Metadata;
 using Windows.System;
 using Windows.UI.Core;
+using WinRT;
 using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 
 namespace Files.App.Views.Shells
@@ -417,7 +419,20 @@ protected void CoreWindow_PointerPressed(object sender, PointerRoutedEventArgs a
 
 		protected async void ShellPage_PathBoxItemDropped(object sender, PathBoxItemDroppedEventArgs e)
 		{
-			await FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.Package, e.Path, false, true);
+			if ((bool)e.Package.Properties.GetValueOrDefault("dragRightButton", false))
+			{
+				Windows.Win32.PInvoke.GetCursorPos(out var dropPoint);
+				using var sf = new Vanara.Windows.Shell.ShellFolder(e.Path);
+				var dataObjectProvider = e.Package.As<Shell32.IDataObjectProvider>();
+				var iddo = dataObjectProvider.GetDataObject();
+				var dropTarget = sf.GetViewObject<Ole32.IDropTarget>(HWND.NULL);
+				dropTarget.DragEnter(iddo, MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)e.AcceptedOperation);
+				dropTarget.Drop(iddo, MouseButtonState.MK_RBUTTON, new() { X=dropPoint.X, Y=dropPoint.Y }, (Ole32.DROPEFFECT)e.AcceptedOperation);
+			}
+			else
+			{
+				await FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.Package, e.Path, false, true);
+			}
 			e.SignalEvent?.Set();
 		}