fix: Fully qualify Window for iOS/macOS

unoplatform · Sep 4, 2020 · 308ef6c · 308ef6c
1 parent c53316a
commit 308ef6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorPickerSlider.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorPickerSlider.cs
@@ -67,7 +67,8 @@ protected override void OnKeyDown(KeyRoutedEventArgs args)
 				return;
 			}
 
-			bool isControlDown = (Window.Current.CoreWindow.GetKeyState(VirtualKey.Control) & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
+			// Uno Doc: Window must be fully qualified for iOS/macOS where NSWindow maps to Window
+			bool isControlDown = (Windows.UI.Xaml.Window.Current.CoreWindow.GetKeyState(VirtualKey.Control) & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
 
 			double minBound = 0;
 			double maxBound = 0;

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs
@@ -190,7 +190,8 @@ protected override void OnKeyDown(KeyRoutedEventArgs args)
 				return;
 			}
 
-			bool isControlDown = (Window.Current.CoreWindow.GetKeyState(VirtualKey.Control) & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
+			// Uno Doc: Window must be fully qualified for iOS/macOS where NSWindow maps to Window
+			bool isControlDown = (Windows.UI.Xaml.Window.Current.CoreWindow.GetKeyState(VirtualKey.Control) & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
 
 			ColorPickerHsvChannel incrementChannel = ColorPickerHsvChannel.Hue;