|
|
@ -458,10 +458,6 @@ |
|
|
<Setter Property="Template"> |
|
|
<Setter Property="Template"> |
|
|
<Setter.Value> |
|
|
<Setter.Value> |
|
|
<ControlTemplate TargetType="{x:Type local:Calculator}"> |
|
|
<ControlTemplate TargetType="{x:Type local:Calculator}"> |
|
|
<Grid> |
|
|
|
|
|
<Grid.RowDefinitions> |
|
|
|
|
|
<RowDefinition Height="Auto" /> |
|
|
|
|
|
</Grid.RowDefinitions> |
|
|
|
|
|
<Border Background="{TemplateBinding Background}" |
|
|
<Border Background="{TemplateBinding Background}" |
|
|
BorderBrush="{TemplateBinding BorderBrush}" |
|
|
BorderBrush="{TemplateBinding BorderBrush}" |
|
|
BorderThickness="{TemplateBinding BorderThickness}" |
|
|
BorderThickness="{TemplateBinding BorderThickness}" |
|
|
@ -469,7 +465,7 @@ |
|
|
<Grid Margin="10"> |
|
|
<Grid Margin="10"> |
|
|
<Grid.RowDefinitions> |
|
|
<Grid.RowDefinitions> |
|
|
<RowDefinition Height="Auto" /> |
|
|
<RowDefinition Height="Auto" /> |
|
|
<RowDefinition Height="Auto" /> |
|
|
<RowDefinition Height="*" /> |
|
|
</Grid.RowDefinitions> |
|
|
</Grid.RowDefinitions> |
|
|
<Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1"> |
|
|
<Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1"> |
|
|
<StackPanel> |
|
|
<StackPanel> |
|
|
@ -487,7 +483,6 @@ |
|
|
<ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" /> |
|
|
<ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" /> |
|
|
</Grid> |
|
|
</Grid> |
|
|
</Border> |
|
|
</Border> |
|
|
</Grid> |
|
|
|
|
|
<ControlTemplate.Triggers> |
|
|
<ControlTemplate.Triggers> |
|
|
<Trigger Property="IsFocused" Value="True"> |
|
|
<Trigger Property="IsFocused" Value="True"> |
|
|
<Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" /> |
|
|
<Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" /> |
|
|
|