Revert PR #762 (#1134)

1 files changed, 0 insertions, 19 deletions

diff --git a/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs b/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
index d4ee918e..a7aa16f0 100644
--- a/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
+++ b/Xamarin.Forms.Platform.WinRT/PickerRenderer.cs
@@ -19,7 +19,6 @@ namespace Xamarin.Forms.Platform.WinRT
 	{
 		bool _isAnimating;
 		Brush _defaultBrush;
-		bool _dropDownWasOpened;
 
 		protected override void Dispose(bool disposing)
 		{
@@ -33,7 +32,6 @@ namespace Xamarin.Forms.Platform.WinRT
 					Control.DropDownClosed -= OnDropDownOpenStateChanged;
 					Control.OpenAnimationCompleted -= ControlOnOpenAnimationCompleted;
 					Control.Loaded -= ControlOnLoaded;
-					Control.GotFocus -= ControlOnGotFocus;
 				}
 			}
 
@@ -53,7 +51,6 @@ namespace Xamarin.Forms.Platform.WinRT
 					Control.OpenAnimationCompleted += ControlOnOpenAnimationCompleted;
 					Control.ClosedAnimationStarted += ControlOnClosedAnimationStarted;
 					Control.Loaded += ControlOnLoaded;
-					Control.GotFocus += ControlOnGotFocus;
 				}
 
 				Control.ItemsSource = ((LockableObservableListWrapper)Element.Items)._list;
@@ -105,19 +102,6 @@ namespace Xamarin.Forms.Platform.WinRT
 			}
 		}
 
-		void ControlOnGotFocus(object sender, RoutedEventArgs routedEventArgs)
-		{
-			// The FormsComboBox is separate from the Popup/dropdown that it uses to select an item,
-			// and the behavior here is changed to be similar to the other platforms where focusing the
-			// Picker opens the dropdown (with the exception where if focus was given via keyboard, such
-			// as tabbing through controls). The _dropDownWasOpened flag is reset to false in the case that
-			// the FormsComboBox regained focus after the dropdown closed.
-			if (!_dropDownWasOpened && Control.FocusState != FocusState.Keyboard)
-				Control.IsDropDownOpen = true;
-			else
-				_dropDownWasOpened = false;
-		}
-
 		void OnControlSelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
 			if (Element != null)
@@ -145,9 +129,6 @@ namespace Xamarin.Forms.Platform.WinRT
 				_isAnimating = false;
 				// and force the final redraw
 				((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
-
-				// Related to ControlOnGotFocus, _dropDownWasOpened is set to true
-				_dropDownWasOpened = true;
 			}
 		}