github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 13:23:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added the name property for CalculationResult right/left scroll buttons on screen (#503)

Browse source 
* Added the property name to be shown on the Scrollable links to solve issue 482

* Added the x:uid tag for the buttons and also added the automationID

* Added two new uids keys for the left and right scroll buttons for the calculation result.
This commit is contained in:
MelulekiDube 2019-05-18 00:54:34 +02:00 • committed by Stephanie Anderl
commit 00f0f25dfc
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Calculator/App.xaml
View file

@ -353,8 +353,7 @@
<Setter Property="ZoomMode" Value="Disabled"/> <Setter Property="ZoomMode" Value="Disabled"/>
</Style> </Style>
<Style x:Key="CalculationResultStyle" <Style x:Key="CalculationResultStyle" TargetType="Controls:CalculationResult">
TargetType="Controls:CalculationResult">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/> <Setter Property="Foreground" Value="{ThemeResource SystemControlPageTextBaseHighBrush}"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/> <Setter Property="HorizontalAlignment" Value="Stretch"/>
@ -401,6 +400,7 @@
TextWrapping="NoWrap"/> TextWrapping="NoWrap"/>
</ScrollViewer> </ScrollViewer>
<HyperlinkButton x:Name="ScrollLeft" <HyperlinkButton x:Name="ScrollLeft"
x:Uid="CalculationResultScrollLeft"
Grid.Column="0" Grid.Column="0"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
@ -412,6 +412,7 @@
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
AutomationProperties.AutomationId="CalculationResultScrollLeft"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollLeftText" <FontIcon x:Name="ScrollLeftText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"
@ -419,6 +420,7 @@
Glyph="&#xE26C;"/> Glyph="&#xE26C;"/>
</HyperlinkButton> </HyperlinkButton>
<HyperlinkButton x:Name="ScrollRight" <HyperlinkButton x:Name="ScrollRight"
x:Uid="CalculationResultScrollRight"
Grid.Column="2" Grid.Column="2"
Width="20" Width="20"
MinWidth="20" MinWidth="20"
@ -430,6 +432,7 @@
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{ThemeResource SystemControlForegroundAccentBrush}" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"
BorderThickness="0" BorderThickness="0"
AutomationProperties.AutomationId="CalculationResultScrollRight"
Visibility="Collapsed"> Visibility="Collapsed">
<FontIcon x:Name="ScrollRightText" <FontIcon x:Name="ScrollRightText"
FontFamily="{ThemeResource SymbolThemeFontFamily}" FontFamily="{ThemeResource SymbolThemeFontFamily}"

8
src/Calculator/Resources/en-US/Resources.resw
View file

@ -3387,4 +3387,12 @@
<value>Pyeong</value> <value>Pyeong</value>
<comment>A measurement unit for area.</comment> <comment>A measurement unit for area.</comment>
</data> </data>
<data name="CalculationResultScrollLeft.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Scroll Calculation Result Left</value>
<comment>Automation label for the "Scroll Left" button that appears when a calculation result is too large to fit in calculation result text box.</comment>
</data>
<data name="CalculationResultScrollRight.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Scroll Calculation Result Right</value>
<comment>Automation label for the "Scroll Right" button that appears when a calculation result is too large to fit in calculation result text box.</comment>
</data>
</root> </root>