diff --git a/components/Sizers/src/SizerBase.Properties.cs b/components/Sizers/src/SizerBase.Properties.cs index 3688c72a..9b30b40d 100644 --- a/components/Sizers/src/SizerBase.Properties.cs +++ b/components/Sizers/src/SizerBase.Properties.cs @@ -132,9 +132,7 @@ private static void OnOrientationPropertyChanged(DependencyObject d, DependencyP return; #endif - // TODO: [UNO] Only supported on certain platforms - // See ProtectedCursor here: https://github.com/unoplatform/uno/blob/3fe3862b270b99dbec4d830b547942af61b1a1d9/src/Uno.UI/UI/Xaml/UIElement.cs#L1015-L1023 -#if WINAPPSDK && !HAS_UNO +#if WINUI3 // Need to wait until we're at least applying template step of loading before setting Cursor // See https://github.com/microsoft/microsoft-ui-xaml/issues/7062 if (gripper._appliedTemplate && diff --git a/components/Sizers/src/SizerBase.cs b/components/Sizers/src/SizerBase.cs index 16d10492..0cf9b01c 100644 --- a/components/Sizers/src/SizerBase.cs +++ b/components/Sizers/src/SizerBase.cs @@ -100,8 +100,7 @@ protected override AutomationPeer OnCreateAutomationPeer() return new SizerAutomationPeer(this); } -// On Uno the ProtectedCursor isn't supported yet, so we don't need this value. -#if WINAPPSDK && !HAS_UNO +#if WINUI3 // Used to track when we're in the OnApplyTemplateStep to change ProtectedCursor value. private bool _appliedTemplate = false; #endif @@ -133,7 +132,7 @@ protected override void OnApplyTemplate() // Trigger initial state transition based on if we're Enabled or not currently. SizerBase_IsEnabledChanged(this, null!); -#if WINAPPSDK && !HAS_UNO +#if WINUI3 // On WinAppSDK, we'll trigger this to setup the initial ProtectedCursor value. _appliedTemplate = true; #endif