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

fixes #313

Browse source 
Collapses the currency status textblock when the contents are empty to avoid adding an element in the accessibility tree.
This commit is contained in:
Eric Wong(Azure) 2019-04-19 09:47:08 -07:00
commit 3da3441ea8
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Calculator/Views/UnitConverter.xaml
View file

@ -428,14 +428,21 @@
</VisualState>
</VisualStateGroup>
<VisualStateGroup x:Name="CurrencySecondaryStatusStates">
<VisualState x:Name="NormalCurrencyStatus">
<VisualState.Setters>
<Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Collapsed"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="ChargesMayApplyCurrencyStatus">
<VisualState.Setters>
<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextBaseHighColorBrush}"/>
<Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Visible"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="FailedCurrencyStatus">
<VisualState.Setters>
<Setter Target="CurrencySecondaryStatus.Foreground" Value="{ThemeResource AppControlPageTextRedColorBrush}"/>
<Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Visible"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
@ -615,7 +622,8 @@
x:Uid="RefreshButtonText"
Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
Click="CurrencyRefreshButton_Click"/>
<TextBlock Margin="0,7,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
<TextBlock x:Name="CurrencySecondaryStatusBlock" Margin="0,7,0,0"
Style="{ThemeResource CaptionTextBlockStyle}">
<Run x:Name="Spacing" Text="&#x200A;"/>
<Run x:Name="CurrencySecondaryStatus"
FontWeight="SemiBold"

1
src/Calculator/Views/UnitConverter.xaml.cpp
View file

@ -152,6 +152,7 @@ void UnitConverter::OnOfflineNetworkAccess()
void UnitConverter::SetNormalCurrencyStatus()
{
VisualStateManager::GoToState(this, L"NormalCurrencyStatus", false);
CurrencySecondaryStatus->Text = L"";
}