Set CanDrag and AllowDrop only if needed (#22640)

dotnet · Jun 4, 2024 · 6d4d7bd · 6d4d7bd
1 parent 5d3e788
commit 6d4d7bd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Windows.cs b/src/Controls/src/Core/Platform/GestureManager/GesturePlatformManager.Windows.cs
@@ -315,6 +315,7 @@ void ClearContainerEventHandlers()
 				{
 					_subscriptionFlags &= ~SubscriptionFlags.ContainerDragEventsSubscribed;
 
+					_container.CanDrag = false;
 					_container.DragStarting -= HandleDragStarting;
 					_container.DropCompleted -= HandleDropCompleted;
 				}
@@ -323,6 +324,7 @@ void ClearContainerEventHandlers()
 				{
 					_subscriptionFlags &= ~SubscriptionFlags.ContainerDropEventsSubscribed;
 
+					_container.AllowDrop = false;
 					_container.DragOver -= HandleDragOver;
 					_container.Drop -= HandleDrop;
 					_container.DragLeave -= HandleDragLeave;
@@ -719,15 +721,13 @@ void UpdateDragAndDropGestureRecognizers()
 			}
 
 			bool canDrag = gestures.FirstGestureOrDefault<DragGestureRecognizer>()?.CanDrag ?? false;
-			_container.CanDrag = canDrag;
-
 			bool allowDrop = gestures.FirstGestureOrDefault<DropGestureRecognizer>()?.AllowDrop ?? false;
-			_container.AllowDrop = allowDrop;
 
 			if (canDrag)
 			{
 				_subscriptionFlags |= SubscriptionFlags.ContainerDragEventsSubscribed;
 
+				_container.CanDrag = true;
 				_container.DragStarting += HandleDragStarting;
 				_container.DropCompleted += HandleDropCompleted;
 			}
@@ -736,6 +736,7 @@ void UpdateDragAndDropGestureRecognizers()
 			{
 				_subscriptionFlags |= SubscriptionFlags.ContainerDropEventsSubscribed;
 
+				_container.AllowDrop = true;
 				_container.DragOver += HandleDragOver;
 				_container.Drop += HandleDrop;
 				_container.DragLeave += HandleDragLeave;