Skip to content

Commit d84a12f

Browse files
bclothierbclothier
committed
Revert the StaticResource reference for SystemColors; it causes settings dialog to not open consistently. Also, split all colors & brushes into its own file.
1 parent 0996e0c commit d84a12f

File tree

3 files changed

+137
-132
lines changed

3 files changed

+137
-132
lines changed

‎Rubberduck.Core/UI/Controls/ToolBar.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ItemsControl}}}"/>
3131
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ItemsControl}}}"/>
3232
<Setter Property="Background" Value="Transparent"/>
33-
<Setter Property="Foreground" Value="{StaticResource SystemColors.MenuTextBrushKey}"/>
33+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}"/>
3434
<Setter Property="BorderThickness" Value="1"/>
3535
<Setter Property="Margin" Value="0,1,0,0"/>
3636
<Setter Property="Padding" Value="8,3"/>
@@ -70,7 +70,7 @@
7070
<Setter Property="Background" TargetName="GlyphPanel" Value="{StaticResource GlyphPanelHighlightBackgroundBrush}"/>
7171
</Trigger>
7272
<Trigger Property="IsEnabled" Value="False">
73-
<Setter Property="Foreground" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
73+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
7474
</Trigger>
7575
</ControlTemplate.Triggers>
7676
</ControlTemplate>
@@ -137,7 +137,7 @@
137137
<Setter Property="Color" TargetName="Shdw" Value="{StaticResource DropShadowColor}"/>
138138
</Trigger>
139139
<Trigger Property="IsEnabled" Value="False">
140-
<Setter Property="Foreground" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
140+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
141141
</Trigger>
142142
<Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
143143
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
@@ -174,7 +174,7 @@
174174
<Setter Property="Background" TargetName="Border" Value="{StaticResource HighlightBackgroundBrush}"/>
175175
</Trigger>
176176
<Trigger Property="IsEnabled" Value="False">
177-
<Setter Property="Foreground" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
177+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
178178
</Trigger>
179179
</ControlTemplate.Triggers>
180180
</ControlTemplate>
@@ -245,7 +245,7 @@
245245
<Setter Property="Color" TargetName="Shdw" Value="{StaticResource DropShadowColor}"/>
246246
</Trigger>
247247
<Trigger Property="IsEnabled" Value="False">
248-
<Setter Property="Foreground" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
248+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
249249
</Trigger>
250250
<Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
251251
<Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
@@ -289,7 +289,7 @@
289289
</Setter>
290290
<Style.Triggers>
291291
<DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="true">
292-
<Setter Property="Background" Value="{StaticResource SystemColors.ControlBrushKey}"/>
292+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
293293
</DataTrigger>
294294
</Style.Triggers>
295295
</Style>
@@ -324,7 +324,7 @@
324324
</Setter>
325325
<Style.Triggers>
326326
<DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="true">
327-
<Setter Property="Background" Value="{StaticResource SystemColors.ControlBrushKey}"/>
327+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
328328
</DataTrigger>
329329
</Style.Triggers>
330330
</Style>
@@ -421,15 +421,15 @@
421421
<Setter Property="Background" Value="{StaticResource ToolBarVerticalBackgroundBrush}"/>
422422
</Trigger>
423423
<Trigger Property="IsEnabled" Value="false">
424-
<Setter Property="Foreground" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
424+
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
425425
</Trigger>
426426
</ControlTemplate.Triggers>
427427
</ControlTemplate>
428428
</Setter.Value>
429429
</Setter>
430430
<Style.Triggers>
431431
<DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="true">
432-
<Setter Property="Background" Value="{StaticResource SystemColors.ControlBrushKey}"/>
432+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
433433
</DataTrigger>
434434
</Style.Triggers>
435435
</Style>

‎Rubberduck.Core/UI/Styles/DefaultStyle.xaml

Lines changed: 7 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -3,126 +3,10 @@
33
xmlns:converters="clr-namespace:Rubberduck.UI.Converters;assembly="
44
xmlns:settings="clr-namespace:Rubberduck.UI.Settings"
55
xmlns:settingsConverters="clr-namespace:Rubberduck.UI.Settings.Converters">
6-
7-
<Color x:Key="HighlightGradientStartColor">#FFD9F4FF</Color>
8-
<Color x:Key="HighlightGradientEndColor">#FF9BDDFB</Color>
9-
<Color x:Key="ControlGradientStartColor">#FFEEEDED</Color>
10-
<Color x:Key="ControlGradientEndColor">#FFDDDDDD</Color>
11-
<Color x:Key="ButtonFaceColor">#FFD3D3D3</Color>
12-
<Color x:Key="BorderWireColor">#FF696969</Color>
13-
<Color x:Key="GlyphPanelColor">#FFF8F8FF</Color>
14-
<Color x:Key="GlyphPanelTemplateColor">#FF212121</Color>
15-
<Color x:Key="GlyphPanelBorderColor">#80DADADA</Color>
16-
<Color x:Key="DropShadowColor">#71000000</Color>
17-
<Color x:Key="GreenButtonColor">#FF40C954</Color>
18-
<Color x:Key="GreenButtonBorderColor">#FF008000</Color>
19-
<Color x:Key="GreenButtonMouseOverColor">#FF61D156</Color>
20-
<Color x:Key="HighlightBorderColor">#80DADADA</Color>
21-
<Color x:Key="HighlightBorderActiveColor">#FFADC6E5</Color>
22-
<Color x:Key="HighlightBackgroundColor">#210080FF</Color>
23-
<Color x:Key="HighlightInactiveBorderColor">#FFD3D3D3</Color>
24-
<Color x:Key="GlyphPanelHighlightBorderColor">#90006CD9</Color>
25-
<Color x:Key="GlyphPanelHighlightBackgroundColor">#90006CD9</Color>
26-
<Color x:Key="MouseOverBackgroundColor">#1F26A0DA</Color>
27-
<Color x:Key="MouseOverBorderColor">#A826A0DA</Color>
28-
<Color x:Key="ExpanderBorderColor">#FFA9A9A9</Color>
29-
<Color x:Key="ExpanderBackgroundColor">#FFFFFFFF</Color>
30-
<Color x:Key="CaptionLightColor">#FFFFFFFF</Color>
31-
<Color x:Key="CaptionDarkColor">#FF000000</Color>
32-
<Color x:Key="CaptionErrorColor">#FFFF0000</Color>
33-
<Color x:Key="CaptionDisabledColor">#FF808080</Color>
34-
<Color x:Key="CaptionHyperlinkColor">#FF0000FF</Color>
35-
<Color x:Key="CaptionHyperlinkVisitedColor">#FFFF0000</Color>
36-
<Color x:Key="BackgroundDarkColor">#FFA9A9A9</Color>
37-
<Color x:Key="BackgroundLightColor">#FFF5F5F5</Color>
38-
<Color x:Key="BackgroundSoftColor">#FFF8F8FF</Color>
39-
<Color x:Key="HeaderBackgroundDarkColor">#FFA9A9A9</Color>
40-
<Color x:Key="TabSelectionUnderlineColor">#FF0000FF</Color>
41-
<Color x:Key="GrayColor">#FF696969</Color>
42-
<Color x:Key="BlackColor">#FFFFFFFF</Color>
43-
<Color x:Key="WhiteColor">#FF000000</Color>
44-
<Color x:Key="BusyIndicatorFillColor">#FF00569A</Color>
45-
46-
<Color x:Key="ToolBarButtonHoverColor">#210080FF</Color>
47-
<Color x:Key="ToolBarGripperColor">#FF6D6D6D</Color>
48-
<Color x:Key="ToolBarBackgroundColor">#FFEEF5FD</Color>
49-
<Color x:Key="ToolBarVerticalBackgroundColor">#FFEEF5FD</Color>
50-
<Color x:Key="ToolBarHorizontalBackgroundColor">#FFEEF5FD</Color>
51-
<Color x:Key="ToolBarToggleButtonVerticalBackgroundColor">#FFEEF5FD</Color>
52-
<Color x:Key="ToolBarToggleButtonHorizontalBackgroundColor">#FFEEF5FD</Color>
53-
<Color x:Key="ToolBarMenuBorderColor">#FFB6BDC5</Color>
54-
<Color x:Key="ToolBarSubMenuBackgroundColor">#FFEEF5FD</Color>
55-
56-
<SolidColorBrush x:Key="HighlightGradientStartBrush" Color="{StaticResource HighlightGradientStartColor}"/>
57-
<SolidColorBrush x:Key="HighlightGradientEndBrush" Color="{StaticResource HighlightGradientEndColor}"/>
58-
<SolidColorBrush x:Key="ControlGradientStartBrush" Color="{StaticResource ControlGradientStartColor}"/>
59-
<SolidColorBrush x:Key="ControlGradientEndBrush" Color="{StaticResource ControlGradientEndColor}"/>
60-
<SolidColorBrush x:Key="ButtonFaceBrush" Color="{StaticResource ButtonFaceColor}"/>
61-
<SolidColorBrush x:Key="BorderWireBrush" Color="{StaticResource BorderWireColor}"/>
62-
<SolidColorBrush x:Key="GlyphPanelBrush" Color="{StaticResource GlyphPanelColor}"/>
63-
<SolidColorBrush x:Key="GlyphPanelTemplateBrush" Color="{StaticResource GlyphPanelTemplateColor}"/>
64-
<SolidColorBrush x:Key="GlyphPanelBorderBrush" Color="{StaticResource GlyphPanelBorderColor}"/>
65-
<SolidColorBrush x:Key="GreenButtonBrush" Color="{StaticResource GreenButtonColor}"/>
66-
<SolidColorBrush x:Key="GreenButtonBorderBrush" Color="{StaticResource GreenButtonBorderColor}"/>
67-
<SolidColorBrush x:Key="GreenButtonMouseOverBrush" Color="{StaticResource GreenButtonMouseOverColor}"/>
68-
<SolidColorBrush x:Key="HighlightBorderBrush" Color="{StaticResource HighlightBorderColor}"/>
69-
<SolidColorBrush x:Key="HighlightBorderActiveBrush" Color="{StaticResource HighlightBorderActiveColor}"/>
70-
<SolidColorBrush x:Key="HighlightBackgroundBrush" Color="{StaticResource HighlightBackgroundColor}"/>
71-
<SolidColorBrush x:Key="HighlightInactiveBorderBrush" Color="{StaticResource HighlightInactiveBorderColor}"/>
72-
<SolidColorBrush x:Key="GlyphPanelHighlightBorderBrush" Color="{StaticResource HighlightBorderColor}"/>
73-
<SolidColorBrush x:Key="GlyphPanelHighlightBackgroundBrush" Color="{StaticResource HighlightBackgroundColor}"/>
74-
<SolidColorBrush x:Key="MouseOverBackgroundBrush" Color="{StaticResource MouseOverBackgroundColor}"/>
75-
<SolidColorBrush x:Key="MouseOverBorderBrush" Color="{StaticResource MouseOverBorderColor}"/>
76-
<SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="{StaticResource ExpanderBackgroundColor}"/>
77-
<SolidColorBrush x:Key="ExpanderBorderBrush" Color="{StaticResource ExpanderBorderColor}"/>
78-
<SolidColorBrush x:Key="CaptionLightBrush" Color="{StaticResource CaptionLightColor}"/>
79-
<SolidColorBrush x:Key="CaptionDarkBrush" Color="{StaticResource CaptionDarkColor}"/>
80-
<SolidColorBrush x:Key="CaptionErrorBrush" Color="{StaticResource CaptionErrorColor}"/>
81-
<SolidColorBrush x:Key="CaptionDisabledBrush" Color="{StaticResource CaptionDisabledColor}"/>
82-
<SolidColorBrush x:Key="CaptionHyperlinkBrush" Color="{StaticResource CaptionHyperlinkColor}"/>
83-
<SolidColorBrush x:Key="CaptionHyperlinkVisitedBrush" Color="{StaticResource CaptionHyperlinkVisitedColor}"/>
84-
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
85-
<SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
86-
<SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{StaticResource BackgroundWhiteColor}"/>
87-
<SolidColorBrush x:Key="BackgroundSoftBrush" Color="{StaticResource BackgroundSoftColor}"/>
88-
<SolidColorBrush x:Key="HeaderBackgroundDarkBrush" Color="{StaticResource HeaderBackgroundDarkColor}"/>
89-
<SolidColorBrush x:Key="TabSelectionUnderlineBrush" Color="{StaticResource TabSelectionUnderlineColor}"/>
90-
<SolidColorBrush x:Key="GrayBrush" Color="{StaticResource GrayColor}"/>
91-
<SolidColorBrush x:Key="BlackBrush" Color="{StaticResource BlackColor}"/>
92-
<SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource WhiteColor}"/>
93-
<SolidColorBrush x:Key="BusyIndicatorFillBrush" Color="{StaticResource BusyIndicatorFillColor}"/>
94-
95-
<SolidColorBrush x:Key="ToolBarButtonHoverBrush" Color="{StaticResource ToolBarButtonHoverColor}"/>
96-
<SolidColorBrush x:Key="ToolBarGripperBrush" Color="{StaticResource ToolBarGripperColor}"/>
97-
<SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="{StaticResource ToolBarBackgroundColor}"/>
98-
<SolidColorBrush x:Key="ToolBarVerticalBackgroundBrush" Color="{StaticResource ToolBarVerticalBackgroundColor}"/>
99-
<SolidColorBrush x:Key="ToolBarHorizontalBackgroundBrush" Color="{StaticResource ToolBarHorizontalBackgroundColor}"/>
100-
<SolidColorBrush x:Key="ToolBarToggleButtonVerticalBackgroundBrush" Color="{StaticResource ToolBarToggleButtonVerticalBackgroundColor}"/>
101-
<SolidColorBrush x:Key="ToolBarToggleButtonHorizontalBackgroundBrush" Color="{StaticResource ToolBarToggleButtonHorizontalBackgroundColor}"/>
102-
<SolidColorBrush x:Key="ToolBarMenuBorderBrush" Color="{StaticResource ToolBarMenuBorderColor}"/>
103-
<SolidColorBrush x:Key="ToolBarSubMenuBackgroundBrush" Color="{StaticResource ToolBarSubMenuBackgroundColor}"/>
104-
105-
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="{StaticResource WhiteColor}" />
106-
<SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource WhiteColor}" />
107-
108-
<LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
109-
<GradientStop Color="{StaticResource HighlightGradientStartColor}" Offset="0"/>
110-
<GradientStop Color="{StaticResource HighlightGradientEndColor}" Offset="1"/>
111-
</LinearGradientBrush>
112-
<LinearGradientBrush x:Key="{x:Static SystemColors.ControlBrushKey}" EndPoint="0,1" StartPoint="0,0">
113-
<GradientStop Color="{StaticResource ControlGradientStartColor}" Offset="0"/>
114-
<GradientStop Color="{StaticResource ControlGradientEndColor}" Offset="1"/>
115-
</LinearGradientBrush>
6+
<ResourceDictionary.MergedDictionaries>
7+
<ResourceDictionary Source="LightBlueTheme.xaml"/>
8+
</ResourceDictionary.MergedDictionaries>
1169

117-
<LinearGradientBrush x:Key="Item.SelectedActive.Background" EndPoint="0,1" StartPoint="0,0">
118-
<GradientStop Color="{StaticResource HighlightGradientStartColor}" Offset="0"/>
119-
<GradientStop Color="{StaticResource HighlightGradientEndColor}" Offset="1"/>
120-
</LinearGradientBrush>
121-
<LinearGradientBrush x:Key="Item.SelectedInactive.Background" EndPoint="0,1" StartPoint="0,0">
122-
<GradientStop Color="{StaticResource ControlGradientStartColor}" Offset="0"/>
123-
<GradientStop Color="{StaticResource ControlGradientEndColor}" Offset="1"/>
124-
</LinearGradientBrush>
125-
12610
<Style x:Key="ToolbarIconStyle" TargetType="Image">
12711
<Setter Property="Height" Value="16" />
12812
<Setter Property="Width" Value="16" />
@@ -150,15 +34,15 @@
15034
<Condition Property="Selector.IsSelectionActive" Value="True" />
15135
</MultiTrigger.Conditions>
15236
<Setter Property="BorderBrush" Value="{StaticResource HighlightBorderActiveBrush}"/>
153-
<Setter Property="Background" Value="{StaticResource SystemColors.HighlightBrushKey}" />
37+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
15438
</MultiTrigger>
15539
<MultiTrigger>
15640
<MultiTrigger.Conditions>
15741
<Condition Property="IsSelected" Value="True" />
15842
<Condition Property="Selector.IsSelectionActive" Value="False" />
15943
</MultiTrigger.Conditions>
16044
<Setter Property="BorderBrush" Value="{StaticResource HighlightInactiveBorderBrush}"/>
161-
<Setter Property="Background" Value="{StaticResource SystemColors.InactiveSelectionHighlightBrushKey}" />
45+
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
16246
</MultiTrigger>
16347
</Style.Triggers>
16448
</Style>
@@ -167,7 +51,7 @@
16751
<Setter Property="Control.Template">
16852
<Setter.Value>
16953
<ControlTemplate>
170-
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{StaticResource SystemColors.ControlTextBrushKey}" StrokeThickness="1" StrokeDashArray="1 2"/>
54+
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
17155
</ControlTemplate>
17256
</Setter.Value>
17357
</Setter>
@@ -221,7 +105,7 @@
221105
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource HighlightBorderActiveBrush}"/>
222106
</MultiTrigger>
223107
<Trigger Property="IsEnabled" Value="False">
224-
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{StaticResource SystemColors.GrayTextBrushKey}"/>
108+
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
225109
</Trigger>
226110
</ControlTemplate.Triggers>
227111
</ControlTemplate>

0 commit comments

Comments
 (0)