|
17 | 17 | <Border x:Name="shortcutbutton" BorderThickness="0" BorderBrush="Black" Background="{TemplateBinding Background}">
|
18 | 18 | <ContentPresenter Margin="0" HorizontalAlignment="Center" VerticalAlignment="Center" RecognizesAccessKey="True"/>
|
19 | 19 | </Border>
|
| 20 | + |
20 | 21 | <ControlTemplate.Triggers>
|
| 22 | + <Trigger Property="IsEnabled" Value="True"> |
| 23 | + <Setter Property="Background" Value="{DynamicResource ThemeButtonBackground}" /> |
| 24 | + <Setter Property="Foreground" Value="{DynamicResource ThemeButtonForeground}" /> |
| 25 | + </Trigger> |
| 26 | + <Trigger Property="IsEnabled" Value="False"> |
| 27 | + <Setter Property="Background" Value="{DynamicResource ThemeButtonBackgroundDisabled}" /> |
| 28 | + <Setter Property="Foreground" Value="{DynamicResource ThemeButtonForegroundDisabled}" /> |
| 29 | + </Trigger> |
21 | 30 | <Trigger Property="IsMouseOver" Value="true">
|
22 |
| - <Setter TargetName="shortcutbutton" Property="Background" Value="#FF494949" /> |
| 31 | + <Setter Property="Background" Value="{DynamicResource ThemeButtonBackgroundMouseOver}" /> |
| 32 | + <Setter Property="Foreground" Value="{DynamicResource ThemeBrightText}"/> |
23 | 33 | </Trigger>
|
| 34 | + <!--TODO fix highlight on mousedown--> |
24 | 35 | <Trigger Property="IsPressed" Value="true">
|
25 |
| - <Setter TargetName="shortcutbutton" Property="Background" Value="#FF0F0F0F" /> |
| 36 | + <Setter Property="Background" Value="{DynamicResource ThemeButtonBackgroundPressed}" /> |
| 37 | + <Setter Property="Foreground" Value="{DynamicResource ThemeBrightText}"/> |
26 | 38 | </Trigger>
|
27 | 39 | <Trigger Property="IsFocused" Value="true">
|
28 |
| - <Setter TargetName="shortcutbutton" Property="BorderBrush" Value="{DynamicResource ThemeSystemHighlight}" /> |
29 |
| - <Setter TargetName="shortcutbutton" Property="BorderThickness" Value="1" /> |
| 40 | + <Setter Property="BorderBrush" Value="{DynamicResource ThemeSystemHighlight}" /> |
| 41 | + <Setter Property="BorderThickness" TargetName="shortcutbutton" Value="1" /> |
30 | 42 | </Trigger>
|
31 | 43 | </ControlTemplate.Triggers>
|
32 | 44 | </ControlTemplate>
|
|
210 | 222 | <ColumnDefinition Width="*"/>
|
211 | 223 | <ColumnDefinition Width="*"/>
|
212 | 224 | </Grid.ColumnDefinitions>
|
213 |
| - <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="0,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" TabIndex="4" > |
214 |
| - <Label Foreground="{DynamicResource ThemeButtonForeground}" Content="Cancel"/> |
| 225 | + <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Margin="0,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" TabIndex="4" > |
| 226 | + <Label Content="Cancel" Foreground="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}"/> |
215 | 227 | </Button>
|
216 |
| - <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="3,0,0,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" TabIndex="3"> |
217 |
| - <Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Create"/> |
| 228 | + <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Margin="3,0,0,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" TabIndex="3"> |
| 229 | + <Label Content="_Create" Foreground="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}"/> |
218 | 230 | </Button>
|
219 | 231 | </Grid>
|
220 | 232 | </StackPanel>
|
|
0 commit comments