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

Code review feedback

Browse source
This commit is contained in:
Eric Wong(Azure) 2019-04-19 15:43:50 -07:00
commit a5ac6a3940
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -157,14 +157,14 @@ void UnitConverter::SetNormalCurrencyStatus()
void UnitConverter::SetChargesMayApplyStatus() void UnitConverter::SetChargesMayApplyStatus()
{ {
VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
CurrencySecondaryStatus->Text = m_chargesMayApplyText; CurrencySecondaryStatus->Text = m_chargesMayApplyText;
VisualStateManager::GoToState(this, ChargesMayApplyCurrencyStatus->Name, false);
} }
void UnitConverter::SetFailedToRefreshStatus() void UnitConverter::SetFailedToRefreshStatus()
{ {
VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
CurrencySecondaryStatus->Text = m_failedToRefreshText; CurrencySecondaryStatus->Text = m_failedToRefreshText;
VisualStateManager::GoToState(this, FailedCurrencyStatus->Name, false);
} }
void UnitConverter::InitializeOfflineStatusTextBlock() void UnitConverter::InitializeOfflineStatusTextBlock()