Skip to content

Commit 8027ff4

Browse files
committed
Merged PR 9180508: Fixes for 2.8.5
Includes these fixes: * [Fix Deprecated icons ](#8576) * [Fix Voice Access 'Show Bubbles' annotation of WebView2 Content](#8551) * [Add const keyword to resolve warnings (treated as errors) C26462 and C26496](#8567) * [[WebView2] Apply text scale factor to CoreWebView2 content](#8540) * [Fix horizontal scrolling on trackpad](#8403)
2 parents 4aa80ad + ba7dc25 commit 8027ff4

File tree

91 files changed

+280
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+280
-208
lines changed

dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
<StackPanel.Resources>
583583
<controls:FontIconSource x:Name="MyFontIconSource" Glyph="{Binding ElementName=boundFallback, Path=FallbackGlyph}"/>
584584
</StackPanel.Resources>
585-
<local:AnimatedIconHost Foreground="{StaticResource TestIconForeground}" x:Name="boundFallback" Title="AnimatedFindVisualSource" Background="DarkSlateGray" FallbackGlyph="&#xE001;">
585+
<local:AnimatedIconHost Foreground="{StaticResource TestIconForeground}" x:Name="boundFallback" Title="AnimatedFindVisualSource" Background="DarkSlateGray" FallbackGlyph="&#xE73E;">
586586
<local:AnimatedIconHost.IconSource>
587587
<controls:AnimatedIconSource FallbackIconSource="{StaticResource MyFontIconSource}"/>
588588
</local:AnimatedIconHost.IconSource>

dev/AutoSuggestBox/AutoSuggestBoxHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void AutoSuggestBoxHelper::OnKeepInteriorCornersSquarePropertyChanged(
5454
{
5555
if (auto autoSuggestBox = sender.try_as<winrt::AutoSuggestBox>())
5656
{
57-
bool shouldMonitorAutoSuggestEvents = unbox_value<bool>(args.NewValue());
57+
const bool shouldMonitorAutoSuggestEvents = unbox_value<bool>(args.NewValue());
5858
if (shouldMonitorAutoSuggestEvents)
5959
{
6060
auto revokersInspectable = winrt::make<AutoSuggestEventRevokers>();

dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
HorizontalAlignment="Center"
121121
FontStyle="Normal"
122122
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
123-
Text="&#xE10A;"
123+
Text="&#xE894;"
124124
FontFamily="{ThemeResource SymbolThemeFontFamily}"
125125
AutomationProperties.AccessibilityView="Raw" />
126126
</Grid>

dev/AutoSuggestBox/AutoSuggestBox_themeresources_v1.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
VerticalAlignment="Center"
113113
HorizontalAlignment="Center"
114114
FontStyle="Normal"
115-
Text="&#xE10A;"
115+
Text="&#xE894;"
116116
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
117117
FontFamily="{ThemeResource SymbolThemeFontFamily}"
118118
AutomationProperties.AccessibilityView="Raw" />

dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<controls:AnimatedIcon>
2222
<animatedvisuals:AnimatedFindVisualSource/>
2323
<controls:AnimatedIcon.FallbackIconSource>
24-
<controls:FontIconSource Glyph="&#xE11A;" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
24+
<controls:FontIconSource Glyph="&#xE721;" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}"/>
2525
</controls:AnimatedIcon.FallbackIconSource>
2626
</controls:AnimatedIcon>
2727
</AutoSuggestBox.QueryIcon>

dev/Breadcrumb/BreadcrumbBarItem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ bool BreadcrumbBarItem::IgnorePointerId(const winrt::PointerRoutedEventArgs& arg
732732
{
733733
MUX_ASSERT(m_isEllipsisDropDownItem);
734734

735-
uint32_t pointerId = args.Pointer().PointerId();
735+
const uint32_t pointerId = args.Pointer().PointerId();
736736

737737
if (m_trackedPointerId == 0)
738738
{

dev/Breadcrumb/BreadcrumbLayout.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ int BreadcrumbLayout::GetFirstBreadcrumbBarItemToArrange(winrt::NonVirtualizingL
106106

107107
for (int i = itemCount - 2; i >= 0; --i)
108108
{
109-
float newAccumLength = accumLength + GetElementAt(context, i).DesiredSize().Width;
109+
const float newAccumLength = accumLength + GetElementAt(context, i).DesiredSize().Width;
110110
if (newAccumLength > m_availableSize.Width)
111111
{
112112
return i + 1;

dev/ColorPicker/ColorPicker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ void ColorPicker::OnColorChanged(winrt::DependencyPropertyChangedEventArgs const
323323
UpdateColorControls(ColorUpdateReason::ColorPropertyChanged);
324324
}
325325

326-
winrt::Color oldColor = unbox_value<winrt::Color>(args.OldValue());
327-
winrt::Color newColor = unbox_value<winrt::Color>(args.NewValue());
326+
const winrt::Color oldColor = unbox_value<winrt::Color>(args.OldValue());
327+
const winrt::Color newColor = unbox_value<winrt::Color>(args.NewValue());
328328

329329
if (oldColor.A != newColor.A ||
330330
oldColor.R != newColor.R ||

dev/ColorPicker/ColorPickerSlider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void ColorPickerSlider::OnKeyDown(winrt::KeyRoutedEventArgs const& args)
5959
return;
6060
}
6161

62-
bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
62+
const bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
6363

6464
double minBound = 0;
6565
double maxBound = 0;

dev/ColorPicker/ColorSpectrum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void ColorSpectrum::OnKeyDown(winrt::KeyRoutedEventArgs const& args)
106106
return;
107107
}
108108

109-
bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
109+
const bool isControlDown = (winrt::Window::Current().CoreWindow().GetKeyState(winrt::VirtualKey::Control) & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down;
110110

111111
winrt::ColorPickerHsvChannel incrementChannel = winrt::ColorPickerHsvChannel::Hue;
112112

0 commit comments

Comments
 (0)