Skip to content

Commit cc85414

Browse files
authored
Fixed an issue for which folder changes after dropping an item (#3468)
1 parent e7b2f31 commit cc85414

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

Files/BaseLayout.cs

+2
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,8 @@ protected async void Item_Drop(object sender, DragEventArgs e)
968968
var deferral = e.GetDeferral();
969969

970970
e.Handled = true;
971+
dragOverItem = null; // Reset dragged over item
972+
971973
ListedItem rowItem = GetItemFromElement(sender);
972974
if (rowItem != null)
973975
{

Files/UserControls/NavigationToolbar.xaml.cs

+2
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,8 @@ private async void PathBoxItem_DragOver(object sender, DragEventArgs e)
825825

826826
private void PathBoxItem_Drop(object sender, DragEventArgs e)
827827
{
828+
dragOverPath = null; // Reset dragged over pathbox item
829+
828830
if (!((sender as Grid).DataContext is PathBoxItem pathBoxItem) ||
829831
pathBoxItem.Path == "Home" || pathBoxItem.Path == "NewTab".GetLocalized())
830832
{

Files/UserControls/SidebarControl.xaml.cs

+4
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ private void NavigationViewLocationItem_DragOver_SetCaptions(LocationItem sender
409409

410410
private void NavigationViewLocationItem_Drop(object sender, DragEventArgs e)
411411
{
412+
dragOverItem = null; // Reset dragged over item
413+
412414
if (!((sender as Microsoft.UI.Xaml.Controls.NavigationViewItem).DataContext is LocationItem locationItem))
413415
{
414416
return;
@@ -492,6 +494,8 @@ private async void NavigationViewDriveItem_DragOver(object sender, DragEventArgs
492494

493495
private void NavigationViewDriveItem_Drop(object sender, DragEventArgs e)
494496
{
497+
dragOverItem = null; // Reset dragged over item
498+
495499
if (!((sender as Microsoft.UI.Xaml.Controls.NavigationViewItem).DataContext is DriveItem driveItem))
496500
{
497501
return;

0 commit comments

Comments
 (0)