Skip to content

Commit 5e385f3

Browse files
committed
Convert Gray for disabled text into references.
1 parent f8df3cd commit 5e385f3

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@
546546
<Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
547547
<Style.Triggers>
548548
<DataTrigger Binding="{Binding IsObsolete}" Value="True">
549-
<Setter Property="Foreground" Value="Gray" />
549+
<Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
550550
<Setter Property="TextDecorations" Value="Strikethrough" />
551551
</DataTrigger>
552552
<DataTrigger Binding="{Binding ElementName=DisplaySignatures, Path=IsChecked}" Value="True">

Rubberduck.Core/UI/CodeMetrics/CodeMetricsControl.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<Setter Property="Foreground" Value="{Binding IsDimmed, Mode=OneWay, Converter={StaticResource BooleanToDimmed}}" />
8686
<Style.Triggers>
8787
<DataTrigger Binding="{Binding IsObsolete}" Value="True">
88-
<Setter Property="Foreground" Value="Gray" />
88+
<Setter Property="Foreground" Value="{StaticResource CaptionDisabledColor}" />
8989
<Setter Property="TextDecorations" Value="Strikethrough" />
9090
</DataTrigger>
9191
</Style.Triggers>

Rubberduck.Core/UI/Controls/LinkButton.xaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
mc:Ignorable="d"
77
d:DesignHeight="20" d:DesignWidth="50">
8+
<Button.Resources>
9+
<ResourceDictionary>
10+
<ResourceDictionary.MergedDictionaries>
11+
<ResourceDictionary Source="../Styles/DefaultStyle.xaml"/>
12+
</ResourceDictionary.MergedDictionaries>
13+
</ResourceDictionary>
14+
</Button.Resources>
815
<Button.Style>
916
<Style TargetType="Button">
1017
<Setter Property="Width" Value="Auto"/>
@@ -32,7 +39,7 @@
3239
<Setter Property="Foreground" Value="Red" />
3340
</Trigger>
3441
<Trigger Property="IsEnabled" Value="false">
35-
<Setter Property="Foreground" Value="Gray" />
42+
<Setter Property="Foreground" Value="{StaticResource CaptionDisabledBrush}" />
3643
</Trigger>
3744
</Style.Triggers>
3845
</Style>

Rubberduck.Core/UI/Styles/DefaultStyle.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<Color x:Key="ExpanderBorderColor">#FFA9A9A9</Color>
3636
<Color x:Key="ExpanderBackgroundColor">#FFFFFFFF</Color>
3737
<Color x:Key="CaptionLightColor">#FFFFFFFF</Color>
38+
<Color x:Key="CaptionDisabledColor">#FF808080</Color>
3839
<Color x:Key="BackgroundDarkColor">#FFA9A9A9</Color>
3940
<Color x:Key="BackgroundLightColor">#FFF5F5F5</Color>
4041

@@ -58,6 +59,7 @@
5859
<SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="{StaticResource ExpanderBackgroundColor}"/>
5960
<SolidColorBrush x:Key="ExpanderBorderBrush" Color="{StaticResource ExpanderBorderColor}"/>
6061
<SolidColorBrush x:Key="CaptionLightBrush" Color="{StaticResource CaptionLightColor}"/>
62+
<SolidColorBrush x:Key="CaptionDisabledBrush" Color="{StaticResource CaptionDisabledColor}"/>
6163
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
6264
<SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
6365
<SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{StaticResource BackgroundWhiteColor}"/>

0 commit comments

Comments
 (0)