Skip to content

Commit 5ebffa4

Browse files
Resolve last of uno guards for accessibility view and WinAppSDK ignored cursor methods
1 parent 35fb143 commit 5ebffa4

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

labs/SizerBase/src/SizerBase.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:controls="using:CommunityToolkit.Labs.WinUI"
44
xmlns:local="using:CommunityToolkit.Labs.WinUI.SizerBaseLocal"
5-
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
5+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
6+
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
67

78
<ResourceDictionary.ThemeDictionaries>
89
<ResourceDictionary x:Key="Default">
@@ -71,7 +72,7 @@
7172

7273
<TextBlock HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
7374
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
74-
AutomationProperties.AccessibilityView="Raw"
75+
win:AutomationProperties.AccessibilityView="Raw"
7576
FontFamily="{ThemeResource GripperBarFontFamily}"
7677
Foreground="{ThemeResource GripperBarForeground}"
7778
Text="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource OrientationToGlyphConverter}}" />

labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ private static void CursorChanged(DependencyObject d, DependencyPropertyChangedE
8282
#endif
8383
}
8484

85+
#if !WINAPPSDK
8586
private static void Element_PointerEntered(object sender, PointerRoutedEventArgs e)
8687
{
8788
// TODO [UNO] Only supported on certain platforms
@@ -117,4 +118,5 @@ private static void ElementOnUnloaded(object sender, RoutedEventArgs routedEvent
117118
Window.Current.CoreWindow.PointerCursor = _defaultCursor;
118119
#endif
119120
}
121+
#endif
120122
}

0 commit comments

Comments
 (0)