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

cleanup failed revert

Browse source
This commit is contained in:
Eric Wong(Azure) 2019-04-22 10:31:44 -07:00
commit 91f3e73509
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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