This commit is contained in:
DB P 2025-04-05 07:17:41 +09:00
parent b81f9be1ad
commit cd39164ab3

View file

@ -3524,7 +3524,7 @@
<!-- Content Dialog --> <!-- Content Dialog -->
<Style x:Key="ContentDialog" TargetType="ui:ContentDialog"> <Style x:Key="ContentDialog" TargetType="ui:ContentDialog">
<Setter Property="Foreground" Value="{DynamicResource PopupTextColor}" /> <Setter Property="Foreground" Value="{DynamicResource PopupTextColor}" />
<Setter Property="Background" Value="{DynamicResource PopuBGColor}" /> <Setter Property="Background" Value="{DynamicResource PopupBGColor}" />
<Setter Property="BorderThickness" Value="{DynamicResource ContentDialogBorderWidth}" /> <Setter Property="BorderThickness" Value="{DynamicResource ContentDialogBorderWidth}" />
<Setter Property="BorderBrush" Value="{DynamicResource ContentDialogBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ContentDialogBorderBrush}" />
<Setter Property="IsTabStop" Value="False" /> <Setter Property="IsTabStop" Value="False" />
@ -3626,47 +3626,51 @@
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
<Border Grid.Row="1" Background="{DynamicResource PopupButtonAreaBGColor}" <Border
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" Grid.Row="1"
BorderThickness="0,1,0,0" Padding="26 0 26 0" CornerRadius="0 0 8 8"> Padding="26 0 26 0"
<Grid Background="{DynamicResource PopupButtonAreaBGColor}"
x:Name="CommandSpace" BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
HorizontalAlignment="Stretch" BorderThickness="0 1 0 0"
VerticalAlignment="Center" CornerRadius="0 0 8 8">
KeyboardNavigation.DirectionalNavigation="Contained"> <Grid
<Grid.ColumnDefinitions> x:Name="CommandSpace"
<ColumnDefinition />
<ColumnDefinition Width="0.5*" />
<ColumnDefinition Width="0.5*" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button
x:Name="PrimaryButton"
Grid.Column="0"
Margin="0 0 2 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Center"
Content="{TemplateBinding PrimaryButtonText}" KeyboardNavigation.DirectionalNavigation="Contained">
IsEnabled="{TemplateBinding IsPrimaryButtonEnabled}" <Grid.ColumnDefinitions>
Style="{TemplateBinding PrimaryButtonStyle}" /> <ColumnDefinition />
<Button <ColumnDefinition Width="0.5*" />
x:Name="SecondaryButton" <ColumnDefinition Width="0.5*" />
Grid.Column="1" <ColumnDefinition />
Grid.ColumnSpan="2" </Grid.ColumnDefinitions>
Margin="2 0 2 0" <Button
HorizontalAlignment="Stretch" x:Name="PrimaryButton"
VerticalAlignment="Stretch" Grid.Column="0"
Content="{TemplateBinding SecondaryButtonText}" Margin="0 0 2 0"
IsEnabled="{TemplateBinding IsSecondaryButtonEnabled}" HorizontalAlignment="Stretch"
Style="{TemplateBinding SecondaryButtonStyle}" /> VerticalAlignment="Stretch"
<Button Content="{TemplateBinding PrimaryButtonText}"
x:Name="CloseButton" IsEnabled="{TemplateBinding IsPrimaryButtonEnabled}"
Grid.Column="3" Style="{TemplateBinding PrimaryButtonStyle}" />
Margin="2 0 0 0" <Button
HorizontalAlignment="Stretch" x:Name="SecondaryButton"
VerticalAlignment="Stretch" Grid.Column="1"
Content="{TemplateBinding CloseButtonText}" Grid.ColumnSpan="2"
Style="{TemplateBinding CloseButtonStyle}" /> Margin="2 0 2 0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Content="{TemplateBinding SecondaryButtonText}"
IsEnabled="{TemplateBinding IsSecondaryButtonEnabled}"
Style="{TemplateBinding SecondaryButtonStyle}" />
<Button
x:Name="CloseButton"
Grid.Column="3"
Margin="2 0 0 0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Content="{TemplateBinding CloseButtonText}"
Style="{TemplateBinding CloseButtonStyle}" />
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>