|
3524 | 3524 | <!-- Content Dialog --> |
3525 | 3525 | <Style x:Key="ContentDialog" TargetType="ui:ContentDialog"> |
3526 | 3526 | <Setter Property="Foreground" Value="{DynamicResource PopupTextColor}" /> |
3527 | | - <Setter Property="Background" Value="{DynamicResource PopuBGColor}" /> |
| 3527 | + <Setter Property="Background" Value="{DynamicResource PopupBGColor}" /> |
3528 | 3528 | <Setter Property="BorderThickness" Value="{DynamicResource ContentDialogBorderWidth}" /> |
3529 | 3529 | <Setter Property="BorderBrush" Value="{DynamicResource ContentDialogBorderBrush}" /> |
3530 | 3530 | <Setter Property="IsTabStop" Value="False" /> |
|
3626 | 3626 | TextWrapping="Wrap" /> |
3627 | 3627 | </Grid> |
3628 | 3628 | </ScrollViewer> |
3629 | | - <Border Grid.Row="1" Background="{DynamicResource PopupButtonAreaBGColor}" |
3630 | | - BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" |
3631 | | - BorderThickness="0,1,0,0" Padding="26 0 26 0" CornerRadius="0 0 8 8"> |
3632 | | - <Grid |
3633 | | - x:Name="CommandSpace" |
3634 | | - HorizontalAlignment="Stretch" |
3635 | | - VerticalAlignment="Center" |
3636 | | - KeyboardNavigation.DirectionalNavigation="Contained"> |
3637 | | - <Grid.ColumnDefinitions> |
3638 | | - <ColumnDefinition /> |
3639 | | - <ColumnDefinition Width="0.5*" /> |
3640 | | - <ColumnDefinition Width="0.5*" /> |
3641 | | - <ColumnDefinition /> |
3642 | | - </Grid.ColumnDefinitions> |
3643 | | - <Button |
3644 | | - x:Name="PrimaryButton" |
3645 | | - Grid.Column="0" |
3646 | | - Margin="0 0 2 0" |
3647 | | - HorizontalAlignment="Stretch" |
3648 | | - VerticalAlignment="Stretch" |
3649 | | - Content="{TemplateBinding PrimaryButtonText}" |
3650 | | - IsEnabled="{TemplateBinding IsPrimaryButtonEnabled}" |
3651 | | - Style="{TemplateBinding PrimaryButtonStyle}" /> |
3652 | | - <Button |
3653 | | - x:Name="SecondaryButton" |
3654 | | - Grid.Column="1" |
3655 | | - Grid.ColumnSpan="2" |
3656 | | - Margin="2 0 2 0" |
3657 | | - HorizontalAlignment="Stretch" |
3658 | | - VerticalAlignment="Stretch" |
3659 | | - Content="{TemplateBinding SecondaryButtonText}" |
3660 | | - IsEnabled="{TemplateBinding IsSecondaryButtonEnabled}" |
3661 | | - Style="{TemplateBinding SecondaryButtonStyle}" /> |
3662 | | - <Button |
3663 | | - x:Name="CloseButton" |
3664 | | - Grid.Column="3" |
3665 | | - Margin="2 0 0 0" |
| 3629 | + <Border |
| 3630 | + Grid.Row="1" |
| 3631 | + Padding="26 0 26 0" |
| 3632 | + Background="{DynamicResource PopupButtonAreaBGColor}" |
| 3633 | + BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" |
| 3634 | + BorderThickness="0 1 0 0" |
| 3635 | + CornerRadius="0 0 8 8"> |
| 3636 | + <Grid |
| 3637 | + x:Name="CommandSpace" |
3666 | 3638 | HorizontalAlignment="Stretch" |
3667 | | - VerticalAlignment="Stretch" |
3668 | | - Content="{TemplateBinding CloseButtonText}" |
3669 | | - Style="{TemplateBinding CloseButtonStyle}" /> |
| 3639 | + VerticalAlignment="Center" |
| 3640 | + KeyboardNavigation.DirectionalNavigation="Contained"> |
| 3641 | + <Grid.ColumnDefinitions> |
| 3642 | + <ColumnDefinition /> |
| 3643 | + <ColumnDefinition Width="0.5*" /> |
| 3644 | + <ColumnDefinition Width="0.5*" /> |
| 3645 | + <ColumnDefinition /> |
| 3646 | + </Grid.ColumnDefinitions> |
| 3647 | + <Button |
| 3648 | + x:Name="PrimaryButton" |
| 3649 | + Grid.Column="0" |
| 3650 | + Margin="0 0 2 0" |
| 3651 | + HorizontalAlignment="Stretch" |
| 3652 | + VerticalAlignment="Stretch" |
| 3653 | + Content="{TemplateBinding PrimaryButtonText}" |
| 3654 | + IsEnabled="{TemplateBinding IsPrimaryButtonEnabled}" |
| 3655 | + Style="{TemplateBinding PrimaryButtonStyle}" /> |
| 3656 | + <Button |
| 3657 | + x:Name="SecondaryButton" |
| 3658 | + Grid.Column="1" |
| 3659 | + Grid.ColumnSpan="2" |
| 3660 | + Margin="2 0 2 0" |
| 3661 | + HorizontalAlignment="Stretch" |
| 3662 | + VerticalAlignment="Stretch" |
| 3663 | + Content="{TemplateBinding SecondaryButtonText}" |
| 3664 | + IsEnabled="{TemplateBinding IsSecondaryButtonEnabled}" |
| 3665 | + Style="{TemplateBinding SecondaryButtonStyle}" /> |
| 3666 | + <Button |
| 3667 | + x:Name="CloseButton" |
| 3668 | + Grid.Column="3" |
| 3669 | + Margin="2 0 0 0" |
| 3670 | + HorizontalAlignment="Stretch" |
| 3671 | + VerticalAlignment="Stretch" |
| 3672 | + Content="{TemplateBinding CloseButtonText}" |
| 3673 | + Style="{TemplateBinding CloseButtonStyle}" /> |
3670 | 3674 | </Grid> |
3671 | 3675 | </Border> |
3672 | 3676 | </Grid> |
|
0 commit comments