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

Smaller fix

Browse source
This commit is contained in:
Eric Wong(Azure) 2019-04-22 10:21:17 -07:00
commit f6cd1f91a3
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -428,17 +428,21 @@
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
<VisualStateGroup x:Name="CurrencySecondaryStatusStates"> <VisualStateGroup x:Name="CurrencySecondaryStatusStates">
<VisualState x:Name="NormalCurrencyStatus"/> <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="CurrencySecondaryStatusTextBlock.Visibility" Value="Visible"/> <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="CurrencySecondaryStatusTextBlock.Visibility" Value="Visible"/> <Setter Target="CurrencySecondaryStatusBlock.Visibility" Value="Visible"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
@ -618,11 +622,9 @@
x:Uid="RefreshButtonText" x:Uid="RefreshButtonText"
Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}" Foreground="{ThemeResource SystemControlHyperlinkBaseHighBrush}"
Click="CurrencyRefreshButton_Click"/> Click="CurrencyRefreshButton_Click"/>
<TextBlock x:Name="CurrencySecondaryStatusTextBlock" <TextBlock x:Name="CurrencySecondaryStatusBlock"
Margin="0,7,0,0" Margin="3,7,0,0"
Style="{ThemeResource CaptionTextBlockStyle}" Style="{ThemeResource CaptionTextBlockStyle}">
Visibility="Collapsed">
<Run x:Name="Spacing" Text="&#x200A;"/>
<Run x:Name="CurrencySecondaryStatus" <Run x:Name="CurrencySecondaryStatus"
FontWeight="SemiBold" FontWeight="SemiBold"
Text=""/> Text=""/>

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

@ -152,19 +152,20 @@ void UnitConverter::OnOfflineNetworkAccess()
void UnitConverter::SetNormalCurrencyStatus() void UnitConverter::SetNormalCurrencyStatus()
{ {
VisualStateManager::GoToState(this, NormalCurrencyStatus->Name, false); VisualStateManager::GoToState(this, L"NormalCurrencyStatus", false);
CurrencySecondaryStatus->Text = L"";
} }
void UnitConverter::SetChargesMayApplyStatus() void UnitConverter::SetChargesMayApplyStatus()
{ {
VisualStateManager::GoToState(this, L"ChargesMayApplyCurrencyStatus", false);
CurrencySecondaryStatus->Text = m_chargesMayApplyText; CurrencySecondaryStatus->Text = m_chargesMayApplyText;
VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
} }
void UnitConverter::SetFailedToRefreshStatus() void UnitConverter::SetFailedToRefreshStatus()
{ {
VisualStateManager::GoToState(this, L"FailedCurrencyStatus", false);
CurrencySecondaryStatus->Text = m_failedToRefreshText; CurrencySecondaryStatus->Text = m_failedToRefreshText;
VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
} }
void UnitConverter::InitializeOfflineStatusTextBlock() void UnitConverter::InitializeOfflineStatusTextBlock()