Fix check for right click drag

gave92 · gave92 · commit b02fefe975b8 · 2024-12-29T21:47:37.000+01:00
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -193,7 +193,7 @@ public async Task DropAsync(DragEventArgs e)
 
 				try
 				{
-					var isRightButtonDrag = e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");
+					e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);
 
 					if (isRightButtonDrag)
 					{
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1263,7 +1263,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 				}
 				else
 				{
-					var isRightButtonDrag = args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");
+					args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);
 
 					if (isRightButtonDrag)
 					{
@@ -1279,7 +1279,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 
 		private Task<ReturnResult> HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)
 		{
-			var isRightButtonDrag = args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");
+			args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);
 
 			if (isRightButtonDrag)
 			{
diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -1167,7 +1167,7 @@ protected virtual async void Item_Drop(object sender, DragEventArgs e)
 			var item = GetItemFromElement(sender);
 			if (item is not null)
 			{
-				var isRightButtonDrag = e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");
+				e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);
 
 				if (isRightButtonDrag)
 				{
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -419,7 +419,7 @@ protected void CoreWindow_PointerPressed(object sender, PointerRoutedEventArgs a
 
 		protected async void ShellPage_PathBoxItemDropped(object sender, PathBoxItemDroppedEventArgs e)
 		{
-			var isRightButtonDrag = e.Package.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");
+			e.Package.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);
 
 			if (isRightButtonDrag)
 			{

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public async Task DropAsync(DragEventArgs e)`
`193`	`193`
`194`	`194`	`try`
`195`	`195`	`{`
`196`		`- var isRightButtonDrag = e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");`
	`196`	`+ e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);`
`197`	`197`
`198`	`198`	`if (isRightButtonDrag)`
`199`	`199`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1263,7 +1263,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite`
`1263`	`1263`	`}`
`1264`	`1264`	`else`
`1265`	`1265`	`{`
`1266`		`- var isRightButtonDrag = args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");`
	`1266`	`+ args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);`
`1267`	`1267`
`1268`	`1268`	`if (isRightButtonDrag)`
`1269`	`1269`	`{`
`@@ -1279,7 +1279,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite`
`1279`	`1279`
`1280`	`1280`	`private Task<ReturnResult> HandleDriveItemDroppedAsync(DriveItem driveItem, ItemDroppedEventArgs args)`
`1281`	`1281`	`{`
`1282`		`- var isRightButtonDrag = args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");`
	`1282`	`+ args.DroppedItem.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);`
`1283`	`1283`
`1284`	`1284`	`if (isRightButtonDrag)`
`1285`	`1285`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ protected virtual async void Item_Drop(object sender, DragEventArgs e)`
`1167`	`1167`	`var item = GetItemFromElement(sender);`
`1168`	`1168`	`if (item is not null)`
`1169`	`1169`	`{`
`1170`		`- var isRightButtonDrag = e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");`
	`1170`	`+ e.DataView.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);`
`1171`	`1171`
`1172`	`1172`	`if (isRightButtonDrag)`
`1173`	`1173`	`{`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ protected void CoreWindow_PointerPressed(object sender, PointerRoutedEventArgs a`
`419`	`419`
`420`	`420`	`protected async void ShellPage_PathBoxItemDropped(object sender, PathBoxItemDroppedEventArgs e)`
`421`	`421`	`{`
`422`		`- var isRightButtonDrag = e.Package.As<Shell32.IDataObjectProvider>().GetDataObject().GetData<bool>("dragRightButton");`
	`422`	`+ e.Package.As<Shell32.IDataObjectProvider>().GetDataObject().TryGetData<bool>(User32.RegisterClipboardFormat("dragRightButton"), out var isRightButtonDrag);`
`423`	`423`
`424`	`424`	`if (isRightButtonDrag)`
`425`	`425`	`{`