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

Ensure consistent margins/padding with currency converter keypad (#566)

Browse Source 
Simplifies the layout of `ConverterNumPad` to match that
seen of `NumpadPanel` in Calculator.xaml by using the same
static margin and removing the use of columns that had been used
for dynamic margins.

Fixes #87
This commit is contained in:
Howard Wolosky 2019-06-28 15:45:43 -07:00 committed by GitHub
parent b3432c93c8
commit 25708f0bef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,8 +321,6 @@
Threshold="1"/> Threshold="1"/>
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="GutterTop.Height" Value="0.5*"/>
<Setter Target="GutterBottom.Height" Value="0.5*"/>
<Setter Target="GutterLeft.Width" Value="48"/> <Setter Target="GutterLeft.Width" Value="48"/>
<Setter Target="GutterRight.Width" Value="48"/> <Setter Target="GutterRight.Width" Value="48"/>
<Setter Target="ColumnLeft.Width" Value="1*"/> <Setter Target="ColumnLeft.Width" Value="1*"/>
@ -644,31 +642,27 @@
<Grid x:Name="ConverterNumPad" <Grid x:Name="ConverterNumPad"
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,6" Margin="3,0,3,3"
FlowDirection="LeftToRight" FlowDirection="LeftToRight"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform> <Grid.RenderTransform>
<CompositeTransform/> <CompositeTransform/>
</Grid.RenderTransform> </Grid.RenderTransform>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition x:Name="GutterTop" Height="0"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition Height="1*"/> <RowDefinition Height="1*"/>
<RowDefinition x:Name="GutterBottom" Height="0"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="0.25*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
<ColumnDefinition Width="0.25*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid x:Uid="DisplayControls" <Grid x:Uid="DisplayControls"
Grid.Row="1" Grid.Row="0"
Grid.Column="2" Grid.Column="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
AutomationProperties.HeadingLevel="Level1"> AutomationProperties.HeadingLevel="Level1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -696,9 +690,9 @@
<local:NumberPad x:Name="NumberPad" <local:NumberPad x:Name="NumberPad"
x:Uid="NumberPad" x:Uid="NumberPad"
Grid.Row="2" Grid.Row="1"
Grid.RowSpan="4" Grid.RowSpan="4"
Grid.Column="1" Grid.Column="0"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
AutomationProperties.HeadingLevel="Level1" AutomationProperties.HeadingLevel="Level1"
@ -707,8 +701,8 @@
TabNavigation="Local"/> TabNavigation="Local"/>
<controls:CalculatorButton x:Name="ConverterNegateButton" <controls:CalculatorButton x:Name="ConverterNegateButton"
x:Uid="converterNegateButton" x:Uid="converterNegateButton"
Grid.Row="5" Grid.Row="4"
Grid.Column="1" Grid.Column="0"
Style="{StaticResource SymbolOperatorButtonStyle}" Style="{StaticResource SymbolOperatorButtonStyle}"
FontSize="16" FontSize="16"
ButtonId="Negate" ButtonId="Negate"