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

Update style name

Browse source
This commit is contained in:
Han Zhang 2021-07-29 16:41:30 +08:00
commit a4b5a71845
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Calculator/App.xaml
View file

@ -834,10 +834,10 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalCalculationResultsStyle" <contract7NotPresent:Style x:Key="ConditionalCalculationResultStyle"
BasedOn="{StaticResource CalculationResultStyle}" BasedOn="{StaticResource CalculationResultStyle}"
TargetType="Controls:CalculationResult"/> TargetType="Controls:CalculationResult"/>
<contract7Present:Style x:Key="ConditionalCalculationResultsStyle" <contract7Present:Style x:Key="ConditionalCalculationResultStyle"
BasedOn="{StaticResource CalculationResultStyle}" BasedOn="{StaticResource CalculationResultStyle}"
TargetType="Controls:CalculationResult"> TargetType="Controls:CalculationResult">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/> <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>

2
src/Calculator/Views/Calculator.xaml
View file

@ -210,7 +210,7 @@
<!-- Calculation Result Styles --> <!-- Calculation Result Styles -->
<Style x:Key="ResultsStyle" <Style x:Key="ResultsStyle"
BasedOn="{StaticResource ConditionalCalculationResultsStyle}" BasedOn="{StaticResource ConditionalCalculationResultStyle}"
TargetType="controls:CalculationResult"> TargetType="controls:CalculationResult">
<Setter Property="HorizontalContentAlignment" Value="Right"/> <Setter Property="HorizontalContentAlignment" Value="Right"/>
<Setter Property="VerticalContentAlignment" Value="Top"/> <Setter Property="VerticalContentAlignment" Value="Top"/>

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

@ -200,7 +200,7 @@
</contract7Present:Style> </contract7Present:Style>
<Style x:Key="ValueBaseStyle" <Style x:Key="ValueBaseStyle"
BasedOn="{StaticResource ConditionalCalculationResultsStyle}" BasedOn="{StaticResource ConditionalCalculationResultStyle}"
TargetType="controls:CalculationResult"> TargetType="controls:CalculationResult">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/> <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>