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

Modify how we manage round corners (#1261)

Browse Source
This commit is contained in:
Rudy Huyn 2020-06-02 12:58:47 -07:00 committed by GitHub
parent 20df252d39
commit 0a4296f06a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
View File

@ -1,6 +1,7 @@
<UserControl x:Class="CalculatorApp.GraphingSettings" <UserControl x:Class="CalculatorApp.GraphingSettings"
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:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
xmlns:converters="using:CalculatorApp.Converters" xmlns:converters="using:CalculatorApp.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:CalculatorApp" xmlns:local="using:CalculatorApp"
@ -33,7 +34,9 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="RadioButton"> <ControlTemplate TargetType="RadioButton">
<Grid Name="LayoutRoot" Background="{ThemeResource ToggleButtonBackground}"> <Grid Name="LayoutRoot"
Background="{ThemeResource ToggleButtonBackground}"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/> <VisualState x:Name="Normal"/>
@ -63,7 +66,8 @@
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<Border Name="AccessibilityBorder" <Border Name="AccessibilityBorder"
BorderBrush="{ThemeResource ToggleButtonBorderBrush}" BorderBrush="{ThemeResource ToggleButtonBorderBrush}"
BorderThickness="1"/> BorderThickness="1"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
<Rectangle Name="SelectedBackgroundRectangle" <Rectangle Name="SelectedBackgroundRectangle"
Fill="{ThemeResource ToggleButtonBackgroundChecked}" Fill="{ThemeResource ToggleButtonBackgroundChecked}"
Opacity="0"/> Opacity="0"/>
@ -172,12 +176,11 @@
Style="{StaticResource SubTitleTextBoxStyle}" Style="{StaticResource SubTitleTextBoxStyle}"
AutomationProperties.HeadingLevel="Level2"/> AutomationProperties.HeadingLevel="Level2"/>
<StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}" <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}" Orientation="Horizontal">
CornerRadius="4"
Orientation="Horizontal">
<RadioButton x:Name="Radians" <RadioButton x:Name="Radians"
x:Uid="TrigModeRadians" x:Uid="TrigModeRadians"
Style="{StaticResource TrigUnitsRadioButtonStyle}" Style="{StaticResource TrigUnitsRadioButtonStyle}"
contract7Present:CornerRadius="4,0,0,4"
IsChecked="{x:Bind ViewModel.TrigModeRadians, Mode=TwoWay}"/> IsChecked="{x:Bind ViewModel.TrigModeRadians, Mode=TwoWay}"/>
<RadioButton x:Name="Degrees" <RadioButton x:Name="Degrees"
x:Uid="TrigModeDegrees" x:Uid="TrigModeDegrees"
@ -187,6 +190,7 @@
<RadioButton x:Name="Gradians" <RadioButton x:Name="Gradians"
x:Uid="TrigModeGradians" x:Uid="TrigModeGradians"
Style="{StaticResource TrigUnitsRadioButtonStyle}" Style="{StaticResource TrigUnitsRadioButtonStyle}"
contract7Present:CornerRadius="0,4,4,0"
IsChecked="{x:Bind ViewModel.TrigModeGradians, Mode=TwoWay}"/> IsChecked="{x:Bind ViewModel.TrigModeGradians, Mode=TwoWay}"/>
</StackPanel> </StackPanel>