Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve text scale support on TextBox and NavigationView buttons #9644

Open
wants to merge 3 commits into
base: winui2/main
Choose a base branch
from
Open

Improve text scale support on TextBox and NavigationView buttons #9644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abedd80
fix navigation view pane search button glyph
United600 May 18, 2024
4e8ddd8
disable delete button glyph text scale
United600 May 18, 2024
c03c933
disable reveal password box button glyph text scale
United600 May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
Text=""
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/AutoSuggestBox/AutoSuggestBox_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
Text="&#xE894;"
FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/CommonStyles/PasswordBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
FontSize="{ThemeResource PasswordBoxIconFontSize}"
Text="&#xF78D;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/CommonStyles/PasswordBox_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
FontSize="{ThemeResource PasswordBoxIconFontSize}"
Text="&#xF78D;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/CommonStyles/TextBox_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
FontSize="{ThemeResource TextBoxIconFontSize}"
Text="&#xE894;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/CommonStyles/TextBox_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
FontSize="{ThemeResource TextBoxIconFontSize}"
Text="&#xE894;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/NavigationView/NavigationView_rs1_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="FocusVisualMargin" Value="-4,0" />
<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="IsTextScaleFactorEnabled" Value="False" />
</Style>

<Style x:Key="NavigationViewOverflowButtonStyleWhenPaneOnTop" TargetType="Button">
Expand Down
1 change: 1 addition & 0 deletions dev/NavigationView/NavigationView_rs1_themeresources_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@
<Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
<Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
<Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
<Setter Property="IsTextScaleFactorEnabled" Value="False" />
</Style>

<Style x:Key="NavigationViewOverflowButtonStyleWhenPaneOnTop" TargetType="Button">
Expand Down
1 change: 1 addition & 0 deletions dev/NumberBox/NumberBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
FontSize="{ThemeResource TextBoxIconFontSize}"
Text="&#xE894;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down
1 change: 1 addition & 0 deletions dev/NumberBox/NumberBox_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
FontSize="12"
Text="&#xE894;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
IsTextScaleFactorEnabled="False"
AutomationProperties.AccessibilityView="Raw" />
</Grid>
</ControlTemplate>
Expand Down