|
749 | 749 | <Style x:Key="WPFDevelopersWindow" BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
|
750 | 750 | <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
|
751 | 751 | <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
|
752 |
| - <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
753 |
| - <Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
| 752 | + <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" /> |
| 753 | + <Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" /> |
754 | 754 | <Setter Property="BorderThickness" Value="1" />
|
755 | 755 | <Setter Property="IsTabStop" Value="False" />
|
756 | 756 | <Setter Property="SnapsToDevicePixels" Value="True" />
|
|
1061 | 1061 | <Trigger Property="IsChecked" Value="True">
|
1062 | 1062 | <Setter TargetName="PART_Border" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
1063 | 1063 | <Setter TargetName="PART_Border" Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
1064 |
| - <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
1065 | 1064 | </Trigger>
|
1066 | 1065 | <MultiTrigger>
|
1067 | 1066 | <MultiTrigger.Conditions>
|
|
1691 | 1690 | <Trigger Property="IsChecked" Value="True">
|
1692 | 1691 | <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
1693 | 1692 | <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
1694 |
| - <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
1695 | 1693 | </Trigger>
|
1696 | 1694 | <Trigger Property="IsChecked" Value="{x:Null}">
|
1697 | 1695 | <Trigger.EnterActions>
|
|
2626 | 2624 | <Setter Property="Template">
|
2627 | 2625 | <Setter.Value>
|
2628 | 2626 | <ControlTemplate TargetType="{x:Type DataGridRow}">
|
2629 |
| - <Border x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True"> |
2630 |
| - <Border.Background> |
2631 |
| - <SolidColorBrush Color="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=Background}" /> |
2632 |
| - </Border.Background> |
| 2627 | + <Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True"> |
2633 | 2628 | <SelectiveScrollingGrid>
|
2634 | 2629 | <SelectiveScrollingGrid.ColumnDefinitions>
|
2635 | 2630 | <ColumnDefinition Width="Auto" />
|
|
2841 | 2836 | <ScaleTransform ScaleX="0" ScaleY="1" />
|
2842 | 2837 | </Border.RenderTransform>
|
2843 | 2838 | </Border>
|
2844 |
| - <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> |
| 2839 | + <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> |
2845 | 2840 | <VisualStateManager.VisualStateGroups>
|
2846 | 2841 | <VisualStateGroup x:Name="SelectionStates">
|
2847 | 2842 | <VisualState x:Name="Unselected" />
|
|
2862 | 2857 | <Trigger Property="IsSelected" Value="True">
|
2863 | 2858 | <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
2864 | 2859 | <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
|
2865 |
| - <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
| 2860 | + <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
2866 | 2861 | </Trigger>
|
2867 | 2862 | <Trigger Property="IsMouseOver" Value="True">
|
2868 |
| - <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
| 2863 | + <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
2869 | 2864 | </Trigger>
|
2870 | 2865 | </ControlTemplate.Triggers>
|
2871 | 2866 | </ControlTemplate>
|
|
2889 | 2884 | <ScaleTransform ScaleX="1" ScaleY="0" />
|
2890 | 2885 | </Border.RenderTransform>
|
2891 | 2886 | </Border>
|
2892 |
| - <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> |
| 2887 | + <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> |
2893 | 2888 | <VisualStateManager.VisualStateGroups>
|
2894 | 2889 | <VisualStateGroup x:Name="SelectionStates">
|
2895 | 2890 | <VisualState x:Name="Unselected" />
|
|
2910 | 2905 | <Trigger Property="IsSelected" Value="True">
|
2911 | 2906 | <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
|
2912 | 2907 | <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
|
2913 |
| - <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
| 2908 | + <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
2914 | 2909 | </Trigger>
|
2915 | 2910 | <Trigger Property="IsMouseOver" Value="True">
|
2916 |
| - <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
| 2911 | + <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" /> |
2917 | 2912 | </Trigger>
|
2918 | 2913 | </ControlTemplate.Triggers>
|
2919 | 2914 | </ControlTemplate>
|
|
2957 | 2952 | <Border x:Name="HeaderBorder" Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1">
|
2958 | 2953 | <TabPanel Name="HeaderPanel" Margin="2,2,2,0" Panel.ZIndex="1" IsItemsHost="True" KeyboardNavigation.TabIndex="1" />
|
2959 | 2954 | </Border>
|
2960 |
| - <controls:SmallPanel Name="ContentPanel" Grid.Row="1" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local"> |
| 2955 | + <controls:SmallPanel x:Name="ContentPanel" Grid.Row="1" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local"> |
2961 | 2956 | <ContentPresenter Name="PART_SelectedContentHost" Margin="{TemplateBinding Padding}" Content="{TemplateBinding SelectedContent}" ContentSource="SelectedContent" ContentStringFormat="{TemplateBinding SelectedContentStringFormat}" ContentTemplate="{TemplateBinding SelectedContentTemplate}" SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
|
2962 | 2957 | </controls:SmallPanel>
|
2963 | 2958 | </Grid>
|
|
5701 | 5696 | <ControlTemplate TargetType="{x:Type controls:StepItem}">
|
5702 | 5697 | <StackPanel>
|
5703 | 5698 | <controls:SmallPanel>
|
5704 |
| - <Ellipse Width="45" Height="30" HorizontalAlignment="Center" Fill="{DynamicResource WD.WindowForegroundColorBrush}" /> |
| 5699 | + <Ellipse Width="45" Height="30" HorizontalAlignment="Center" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" /> |
5705 | 5700 | <Border Width="30" Height="30" HorizontalAlignment="Center" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="15">
|
5706 | 5701 | <controls:SmallPanel>
|
5707 | 5702 | <TextBlock Name="PART_Index" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:StepItem}}, Converter={StaticResource WD.StepIndexConverter}}" />
|
|
0 commit comments