|
2777 | 2777 | </Grid>
|
2778 | 2778 | <ControlTemplate.Triggers>
|
2779 | 2779 | <Trigger Property="ui:ControlHelper.PlaceholderForeground" Value="{x:Null}">
|
2780 |
| - <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" /> |
| 2780 | + <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource NumberBoxPlaceHolder}" /> |
2781 | 2781 | </Trigger>
|
2782 | 2782 | <Trigger Property="ui:TextBoxHelper.HasText" Value="True">
|
2783 | 2783 | <Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
|
|
3587 | 3587 | <Grid>
|
3588 | 3588 | <Grid.RowDefinitions>
|
3589 | 3589 | <RowDefinition Height="*" />
|
3590 |
| - <RowDefinition Height="80" x:Name="CommandSpaceRow"/> |
| 3590 | + <RowDefinition x:Name="CommandSpaceRow" Height="80" /> |
3591 | 3591 | </Grid.RowDefinitions>
|
3592 | 3592 | <ScrollViewer
|
3593 | 3593 | x:Name="ContentScrollViewer"
|
|
3638 | 3638 | TextWrapping="Wrap" />
|
3639 | 3639 | </Grid>
|
3640 | 3640 | </ScrollViewer>
|
3641 |
| - <Border x:Name="ButtonAreaBorder" |
3642 |
| - Grid.Row="1" |
3643 |
| - Padding="26 0 26 0" |
3644 |
| - Background="{DynamicResource PopupButtonAreaBGColor}" |
3645 |
| - BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" |
3646 |
| - BorderThickness="0 1 0 0" |
3647 |
| - CornerRadius="0 0 8 8"> |
| 3641 | + <Border |
| 3642 | + x:Name="ButtonAreaBorder" |
| 3643 | + Grid.Row="1" |
| 3644 | + Padding="26 0 26 0" |
| 3645 | + Background="{DynamicResource PopupButtonAreaBGColor}" |
| 3646 | + BorderBrush="{DynamicResource PopupButtonAreaBorderColor}" |
| 3647 | + BorderThickness="0 1 0 0" |
| 3648 | + CornerRadius="0 0 8 8"> |
3648 | 3649 | <Grid
|
3649 | 3650 | x:Name="CommandSpace"
|
3650 | 3651 | HorizontalAlignment="Stretch"
|
|
3792 | 3793 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="CommandSpace" Storyboard.TargetProperty="Visibility">
|
3793 | 3794 | <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
|
3794 | 3795 | </ObjectAnimationUsingKeyFrames>
|
3795 |
| - <!-- If the window has no buttons, it's assumed that the buttons are drawn directly within the window itself (as in the case of the HotkeyDialog). |
3796 |
| - In this case, the command space area is completely hidden. --> |
| 3796 | + <!-- |
| 3797 | + If the window has no buttons, it's assumed that the buttons are drawn directly within the window itself (as in the case of the HotkeyDialog). |
| 3798 | + In this case, the command space area is completely hidden. |
| 3799 | + --> |
3797 | 3800 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonAreaBorder" Storyboard.TargetProperty="Visibility">
|
3798 | 3801 | <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
|
3799 | 3802 | </ObjectAnimationUsingKeyFrames>
|
|
0 commit comments