pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use correct colors for DropDownButton on Aero. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4166 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts^2
Daniel Grunwald 17 years ago
parent
3c7a54507f
commit
ffe4d90838
2 changed files with 18 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml
  2. 30
      src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml

7
src/Main/ICSharpCode.Core.Presentation/themes/Aero.NormalColor.xaml
Unescape View File

@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ICSharpCode.Core.Presentation"
>
<!-- TODO: these colors don't get used currently - the StaticResource in generic.xaml doesn't pick them up, and DynamicResource doesn't work at all -->
<SolidColorBrush x:Key="DropDownButtonActiveBorder" Color="#FF3399FF"/>
<SolidColorBrush x:Key="DropDownButtonActiveBackground" Color="#FFC2E0FF"/>
<SolidColorBrush x:Key="SplitButtonPressedBackground" Color="#FF99CCFF"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}" Color="#FF3399FF"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}" Color="#FFC2E0FF"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}" Color="#FF99CCFF"/>
</ResourceDictionary>

30
src/Main/ICSharpCode.Core.Presentation/themes/generic.xaml
Unescape View File

@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ICSharpCode.Core.Presentation"
>
<SolidColorBrush x:Key="DropDownButtonActiveBorder" Color="#FF0A246A"/>
<SolidColorBrush x:Key="DropDownButtonActiveBackground" Color="#FFB6BDD2"/>
<SolidColorBrush x:Key="SplitButtonPressedBackground" Color="#FF8592B5"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}" Color="#FF0A246A"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}" Color="#FFB6BDD2"/>
<SolidColorBrush x:Key="{ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}" Color="#FF8592B5"/>
<Style TargetType="{x:Type local:DropDownButton}">
<Setter Property="TextElement.Foreground" Value = "{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
@ -46,12 +46,12 @@ @@ -46,12 +46,12 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="UIElement.IsMouseOver" Value="True">
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource DropDownButtonActiveBackground}"/>
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
</Trigger>
<Trigger Property="UIElement.IsKeyboardFocused" Value="True">
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}"/>
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}"/>
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
</Trigger>
<Trigger Property="UIElement.IsEnabled" Value="False">
<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
@ -115,18 +115,18 @@ @@ -115,18 +115,18 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="UIElement.IsMouseOver" Value="True">
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{StaticResource DropDownButtonActiveBackground}"/>
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
</Trigger>
<Trigger Property="UIElement.IsKeyboardFocused" Value="True">
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBackground}"/>
<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{StaticResource DropDownButtonActiveBackground}"/>
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
<Setter Property="Panel.Background" TargetName="PART_DropDownArrow" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBackground}}"/>
</Trigger>
<Trigger Property="ButtonBase.IsPressed" Value="True">
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{StaticResource DropDownButtonActiveBorder}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{StaticResource SplitButtonPressedBackground}"/>
<Setter Property="Border.BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:DropDownButton}, ActiveBorder}}" />
<Setter Property="Panel.Background" TargetName="OuterBorder" Value="{DynamicResource {ComponentResourceKey {x:Type local:SplitButton}, PressedBackground}}"/>
</Trigger>
<Trigger Property="UIElement.IsEnabled" Value="False">
<Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>

Write Preview
Loading…
Cancel
Save