DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update focus style (#1622)

Browse Source 
* Update focus style

* Update style name
This commit is contained in:
hanzhang54 2021-07-29 17:42:10 +08:00 committed by GitHub
parent e06355c9aa
commit a2b7dfa5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 80 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Calculator/App.xaml
View File

@ -757,7 +757,7 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
FlowDirection="LeftToRight"> FlowDirection="LeftToRight">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="16"/> <ColumnDefinition Width="12"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition Width="12"/> <ColumnDefinition Width="12"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -834,6 +834,14 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalCalculationResultStyle"
BasedOn="{StaticResource CalculationResultStyle}"
TargetType="Controls:CalculationResult"/>
<contract7Present:Style x:Key="ConditionalCalculationResultStyle"
BasedOn="{StaticResource CalculationResultStyle}"
TargetType="Controls:CalculationResult">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<Style x:Key="OperatorPanelButtonSmallStyle" <Style x:Key="OperatorPanelButtonSmallStyle"
BasedOn="{StaticResource OperatorPanelButtonStyle}" BasedOn="{StaticResource OperatorPanelButtonStyle}"
@ -1799,6 +1807,7 @@
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{StaticResource CalculatorFontFamily}"/> <Setter Property="FontFamily" Value="{StaticResource CalculatorFontFamily}"/>
<Setter Property="FontSize" Value="16"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="FocusVisualMargin" Value="-3"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
@ -1806,7 +1815,7 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{ThemeResource ControlBorderThemeThickness}" BorderThickness="{ThemeResource ControlBorderThemeThickness}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"> contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
@ -1905,6 +1914,15 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalProgKeypadRadioButtonStyle"
BasedOn="{StaticResource ProgKeypadRadioButtonStyle}"
TargetType="RadioButton"/>
<contract7Present:Style x:Key="ConditionalProgKeypadRadioButtonStyle"
BasedOn="{StaticResource ProgKeypadRadioButtonStyle}"
TargetType="RadioButton">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<Style x:Key="SquareIconButtonStyle" <Style x:Key="SquareIconButtonStyle"
BasedOn="{StaticResource SubtleButtonStyle}" BasedOn="{StaticResource SubtleButtonStyle}"
@ -2080,6 +2098,15 @@
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalHistoryMemoryItemContainerStyle"
BasedOn="{StaticResource HistoryMemoryItemContainerStyle}"
TargetType="ListViewItem"/>
<contract7Present:Style x:Key="ConditionalHistoryMemoryItemContainerStyle"
BasedOn="{StaticResource HistoryMemoryItemContainerStyle}"
TargetType="ListViewItem">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<Style x:Key="OperatorPanelFlyoutStyle" <Style x:Key="OperatorPanelFlyoutStyle"
BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
TargetType="FlyoutPresenter"> TargetType="FlyoutPresenter">

4
src/Calculator/Views/Calculator.xaml
View File

@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation" xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
xmlns:common="using:CalculatorApp.ViewModel.Common" xmlns:common="using:CalculatorApp.ViewModel.Common"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract8NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:contract8NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,8)"
xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)" xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
@ -209,7 +210,7 @@
<!-- Calculation Result Styles --> <!-- Calculation Result Styles -->
<Style x:Key="ResultsStyle" <Style x:Key="ResultsStyle"
BasedOn="{StaticResource CalculationResultStyle}" 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"/>
@ -1071,6 +1072,7 @@
<ContentControl x:Name="HeaderClipper" <ContentControl x:Name="HeaderClipper"
Grid.Column="1" Grid.Column="1"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"
UseSystemFocusVisuals="{StaticResource UseSystemFocusVisuals}"> UseSystemFocusVisuals="{StaticResource UseSystemFocusVisuals}">
<ContentControl.Clip> <ContentControl.Clip>
<RectangleGeometry x:Name="HeaderClipperGeometry"/> <RectangleGeometry x:Name="HeaderClipperGeometry"/>

20
src/Calculator/Views/CalculatorProgrammerOperators.xaml
View File

@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -27,13 +28,14 @@
<Setter Property="FontSize" Value="{ThemeResource CaptionFontSize}"/> <Setter Property="FontSize" Value="{ThemeResource CaptionFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="IsTextScaleFactorEnabled" Value="True"/> <Setter Property="IsTextScaleFactorEnabled" Value="True"/>
<Setter Property="FocusVisualMargin" Value="-3"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<Grid x:Name="ControlRoot" <Grid x:Name="ControlRoot"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{ThemeResource SubtleFillColorTransparentBrush}" Background="{ThemeResource SubtleFillColorTransparentBrush}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"> contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/> <VisualState x:Name="Normal"/>
@ -153,6 +155,14 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalProgModeRadioButtonStyle"
BasedOn="{StaticResource ProgModeRadioButtonStyle}"
TargetType="RadioButton"/>
<contract7Present:Style x:Key="ConditionalProgModeRadioButtonStyle"
BasedOn="{StaticResource ProgModeRadioButtonStyle}"
TargetType="RadioButton">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<MenuFlyout x:Key="ProgrammerOperatorsContextMenu" x:Name="ProgrammerOperatorsContextMenu"> <MenuFlyout x:Key="ProgrammerOperatorsContextMenu" x:Name="ProgrammerOperatorsContextMenu">
<MenuFlyoutItem x:Name="CopyMenuItem" <MenuFlyoutItem x:Name="CopyMenuItem"
@ -196,7 +206,7 @@
<controls:RadixButton x:Name="HexButton" <controls:RadixButton x:Name="HexButton"
x:Uid="hexButton" x:Uid="hexButton"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{ThemeResource ProgModeRadioButtonStyle}" Style="{ThemeResource ConditionalProgModeRadioButtonStyle}"
AutomationProperties.AutomationId="hexButton" AutomationProperties.AutomationId="hexButton"
AutomationProperties.Name="{x:Bind Model.HexDisplayValue_AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.HexDisplayValue_AutomationName, Mode=OneWay}"
Checked="HexButtonChecked" Checked="HexButtonChecked"
@ -207,7 +217,7 @@
x:Uid="decimalButton" x:Uid="decimalButton"
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{ThemeResource ProgModeRadioButtonStyle}" Style="{ThemeResource ConditionalProgModeRadioButtonStyle}"
AutomationProperties.AutomationId="decimalButton" AutomationProperties.AutomationId="decimalButton"
AutomationProperties.Name="{x:Bind Model.DecDisplayValue_AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.DecDisplayValue_AutomationName, Mode=OneWay}"
Checked="DecButtonChecked" Checked="DecButtonChecked"
@ -219,7 +229,7 @@
x:Uid="octButton" x:Uid="octButton"
Grid.Row="2" Grid.Row="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{ThemeResource ProgModeRadioButtonStyle}" Style="{ThemeResource ConditionalProgModeRadioButtonStyle}"
AutomationProperties.AutomationId="octolButton" AutomationProperties.AutomationId="octolButton"
AutomationProperties.Name="{x:Bind Model.OctDisplayValue_AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.OctDisplayValue_AutomationName, Mode=OneWay}"
Checked="OctButtonChecked" Checked="OctButtonChecked"
@ -230,7 +240,7 @@
x:Uid="binaryButton" x:Uid="binaryButton"
Grid.Row="3" Grid.Row="3"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{ThemeResource ProgModeRadioButtonStyle}" Style="{ThemeResource ConditionalProgModeRadioButtonStyle}"
AutomationProperties.AutomationId="binaryButton" AutomationProperties.AutomationId="binaryButton"
AutomationProperties.Name="{x:Bind Model.BinDisplayValue_AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.BinDisplayValue_AutomationName, Mode=OneWay}"
Checked="BinButtonChecked" Checked="BinButtonChecked"

3
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@ -142,7 +142,8 @@
ValueChanged="Slider_ValueChanged" ValueChanged="Slider_ValueChanged"
Value="{x:Bind Value, Mode=TwoWay}" Value="{x:Bind Value, Mode=TwoWay}"
Maximum="{x:Bind Max, Mode=TwoWay}" Maximum="{x:Bind Max, Mode=TwoWay}"
Minimum="{x:Bind Min, Mode=TwoWay}"/> Minimum="{x:Bind Min, Mode=TwoWay}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"/>
<Grid Grid.Row="1" <Grid Grid.Row="1"
Padding="8,0,8,8" Padding="8,0,8,8"

13
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View File

@ -268,15 +268,20 @@
</ControlTemplate> </ControlTemplate>
</Thumb.Template> </Thumb.Template>
</Thumb> </Thumb>
</Grid> </Grid>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalGraphModeToggleSwitchStyle"
BasedOn="{StaticResource GraphModeToggleSwitchStyle}"
TargetType="ToggleSwitch"/>
<contract7Present:Style x:Key="ConditionalGraphModeToggleSwitchStyle"
BasedOn="{StaticResource GraphModeToggleSwitchStyle}"
TargetType="ToggleSwitch">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<Style x:Name="GraphViewToggleButtonStyle" <Style x:Name="GraphViewToggleButtonStyle"
BasedOn="{StaticResource GraphToggleButtonStyle}" BasedOn="{StaticResource GraphToggleButtonStyle}"
TargetType="ToggleButton"> TargetType="ToggleButton">
@ -552,7 +557,7 @@
Margin="0,0,12,2" Margin="0,0,12,2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource GraphModeToggleSwitchStyle}" Style="{StaticResource ConditionalGraphModeToggleSwitchStyle}"
AutomationProperties.AutomationId="SwitchModeToggleButton" AutomationProperties.AutomationId="SwitchModeToggleButton"
AutomationProperties.Name="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsOn), Mode=OneWay}" AutomationProperties.Name="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsOn), Mode=OneWay}"
Toggled="SwitchModeToggleButton_Toggled" Toggled="SwitchModeToggleButton_Toggled"

4
src/Calculator/Views/HistoryList.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="CalculatorApp.HistoryList" <UserControl x:Class="CalculatorApp.HistoryList"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation" xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
@ -81,7 +81,7 @@
</muxc:SwipeControl> </muxc:SwipeControl>
</DataTemplate> </DataTemplate>
<Style x:Key="HistoryItemContainerStyle" <Style x:Key="HistoryItemContainerStyle"
BasedOn="{StaticResource HistoryMemoryItemContainerStyle}" BasedOn="{StaticResource ConditionalHistoryMemoryItemContainerStyle}"
TargetType="ListViewItem"> TargetType="ListViewItem">
<Setter Property="Margin" Value="0,0,0,20"/> <Setter Property="Margin" Value="0,0,0,20"/>
<Setter Property="ContextFlyout" Value="{StaticResource HistoryContextMenu}"/> <Setter Property="ContextFlyout" Value="{StaticResource HistoryContextMenu}"/>

2
src/Calculator/Views/Memory.xaml
View File

@ -39,7 +39,7 @@
<local:MemoryListItem Model="{x:Bind Mode=OneWay}"/> <local:MemoryListItem Model="{x:Bind Mode=OneWay}"/>
</DataTemplate> </DataTemplate>
<Style x:Key="MemoryItemContainerStyle" <Style x:Key="MemoryItemContainerStyle"
BasedOn="{StaticResource HistoryMemoryItemContainerStyle}" BasedOn="{StaticResource ConditionalHistoryMemoryItemContainerStyle}"
TargetType="ListViewItem"> TargetType="ListViewItem">
<Setter Property="Margin" Value="0,0,0,8"/> <Setter Property="Margin" Value="0,0,0,8"/>
<Setter Property="ContextFlyout" Value="{StaticResource MemoryContextMenu}"/> <Setter Property="ContextFlyout" Value="{StaticResource MemoryContextMenu}"/>

6
src/Calculator/Views/StateTriggers/CalculatorProgrammerDisplayPanel.xaml
View File

@ -1,4 +1,4 @@
<UserControl x:Class="CalculatorApp.CalculatorProgrammerDisplayPanel" <UserControl x:Class="CalculatorApp.CalculatorProgrammerDisplayPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
@ -61,14 +61,14 @@
<RadioButton x:Name="FullKeypad" <RadioButton x:Name="FullKeypad"
x:Uid="fullKeypad" x:Uid="fullKeypad"
Style="{StaticResource ProgKeypadRadioButtonStyle}" Style="{StaticResource ConditionalProgKeypadRadioButtonStyle}"
AutomationProperties.AutomationId="fullKeypad" AutomationProperties.AutomationId="fullKeypad"
Content="&#xe75f;" Content="&#xe75f;"
IsChecked="{x:Bind Model.IsBitFlipChecked, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}"/> IsChecked="{x:Bind Model.IsBitFlipChecked, Converter={StaticResource BooleanNegationConverter}, Mode=TwoWay}"/>
<RadioButton x:Name="BitFlip" <RadioButton x:Name="BitFlip"
x:Uid="bitFlip" x:Uid="bitFlip"
Grid.Column="1" Grid.Column="1"
Style="{StaticResource ProgKeypadRadioButtonStyle}" Style="{StaticResource ConditionalProgKeypadRadioButtonStyle}"
AutomationProperties.AutomationId="bitFlip" AutomationProperties.AutomationId="bitFlip"
Content="&#xf7d0;" Content="&#xf7d0;"
IsChecked="{x:Bind Model.IsBitFlipChecked, Mode=TwoWay}"/> IsChecked="{x:Bind Model.IsBitFlipChecked, Mode=TwoWay}"/>

23
src/Calculator/Views/UnitConverter.xaml
View File

@ -1,8 +1,9 @@
<UserControl x:Class="CalculatorApp.UnitConverter" <UserControl x:Class="CalculatorApp.UnitConverter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation" xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:controls="using:CalculatorApp.Controls" xmlns:controls="using:CalculatorApp.Controls"
xmlns:converters="using:CalculatorApp.Converters" xmlns:converters="using:CalculatorApp.Converters"
@ -66,6 +67,7 @@
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="IsTextScaleFactorEnabled" Value="True"/> <Setter Property="IsTextScaleFactorEnabled" Value="True"/>
<Setter Property="UseSystemFocusVisuals" Value="True"/> <Setter Property="UseSystemFocusVisuals" Value="True"/>
<Setter Property="FocusVisualMargin" Value="-3"/>
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<Setter.Value> <Setter.Value>
<ItemsPanelTemplate> <ItemsPanelTemplate>
@ -125,7 +127,7 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"/> contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
<!-- <!--
This first ContentPresenter must be named "ContentPresenter" because This first ContentPresenter must be named "ContentPresenter" because
XAML expects it in the template and has dependencies. It is not used XAML expects it in the template and has dependencies. It is not used
@ -188,14 +190,23 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<contract7NotPresent:Style x:Key="ConditionalComboStyle"
BasedOn="{StaticResource ComboStyle}"
TargetType="ComboBox"/>
<contract7Present:Style x:Key="ConditionalComboStyle"
BasedOn="{StaticResource ComboStyle}"
TargetType="ComboBox">
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
</contract7Present:Style>
<Style x:Key="ValueBaseStyle" <Style x:Key="ValueBaseStyle"
BasedOn="{StaticResource CalculationResultStyle}" 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}"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/> <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Bottom"/> <Setter Property="VerticalContentAlignment" Value="Bottom"/>
<Setter Property="Margin" Value="4,0,0,0"/>
<Setter Property="FontWeight" Value="Light"/> <Setter Property="FontWeight" Value="Light"/>
<Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/> <Setter Property="MinFontSize" Value="{ThemeResource BodyFontSize}"/>
</Style> </Style>
@ -203,14 +214,12 @@
BasedOn="{StaticResource ValueBaseStyle}" BasedOn="{StaticResource ValueBaseStyle}"
TargetType="controls:CalculationResult"> TargetType="controls:CalculationResult">
<Setter Property="MaxFontSize" Value="46"/> <Setter Property="MaxFontSize" Value="46"/>
<Setter Property="Margin" Value="-2,0,0,0"/>
<Setter Property="DisplayMargin" Value="0,0,0,12"/> <Setter Property="DisplayMargin" Value="0,0,0,12"/>
</Style> </Style>
<Style x:Key="ValueMediumStyle" <Style x:Key="ValueMediumStyle"
BasedOn="{StaticResource ValueBaseStyle}" BasedOn="{StaticResource ValueBaseStyle}"
TargetType="controls:CalculationResult"> TargetType="controls:CalculationResult">
<Setter Property="MaxFontSize" Value="40"/> <Setter Property="MaxFontSize" Value="40"/>
<Setter Property="Margin" Value="0,0,0,0"/>
<Setter Property="DisplayMargin" Value="0,0,0,4"/> <Setter Property="DisplayMargin" Value="0,0,0,4"/>
</Style> </Style>
<Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock"> <Style x:Key="CurrencySymbolBaseStyle" TargetType="TextBlock">
@ -552,7 +561,7 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
Style="{ThemeResource ComboStyle}" Style="{ThemeResource ConditionalComboStyle}"
AutomationProperties.AutomationId="Units1" AutomationProperties.AutomationId="Units1"
AutomationProperties.Name="{x:Bind Model.Unit1AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.Unit1AutomationName, Mode=OneWay}"
DropDownClosed="UpdateDropDownState" DropDownClosed="UpdateDropDownState"
@ -602,7 +611,7 @@
Grid.Row="4" Grid.Row="4"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}" HorizontalAlignment="{x:Bind FlowDirectionHorizontalAlignment}"
Style="{ThemeResource ComboStyle}" Style="{ThemeResource ConditionalComboStyle}"
AutomationProperties.AutomationId="Units2" AutomationProperties.AutomationId="Units2"
AutomationProperties.Name="{x:Bind Model.Unit2AutomationName, Mode=OneWay}" AutomationProperties.Name="{x:Bind Model.Unit2AutomationName, Mode=OneWay}"
DropDownClosed="UpdateDropDownState" DropDownClosed="UpdateDropDownState"