Skip to content

Commit 1256042

Browse files
GmausDevGmausDev
committed
Continue With #5451
Styles xamls
1 parent d843415 commit 1256042

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</Style>
2222
</Style.Resources>
2323
<Setter Property="BorderThickness" Value="0,.5,0,0" />
24-
<Setter Property="BorderBrush" Value="{StaticResource ExpanderBorderBrush}" />
24+
<Setter Property="BorderBrush" Value="{DynamicResource ExpanderBorderBrush}" />
2525
<Setter Property="Height" Value="26" />
2626
<Setter Property="TextBlock.FontWeight" Value="Normal" />
2727
<Style.Triggers>
@@ -33,15 +33,15 @@
3333
<Condition Property="IsSelected" Value="True" />
3434
<Condition Property="Selector.IsSelectionActive" Value="True" />
3535
</MultiTrigger.Conditions>
36-
<Setter Property="BorderBrush" Value="{StaticResource HighlightBorderActiveBrush}"/>
36+
<Setter Property="BorderBrush" Value="{DynamicResource HighlightBorderActiveBrush}"/>
3737
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
3838
</MultiTrigger>
3939
<MultiTrigger>
4040
<MultiTrigger.Conditions>
4141
<Condition Property="IsSelected" Value="True" />
4242
<Condition Property="Selector.IsSelectionActive" Value="False" />
4343
</MultiTrigger.Conditions>
44-
<Setter Property="BorderBrush" Value="{StaticResource HighlightInactiveBorderBrush}"/>
44+
<Setter Property="BorderBrush" Value="{DynamicResource HighlightInactiveBorderBrush}"/>
4545
<Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
4646
</MultiTrigger>
4747
</Style.Triggers>
@@ -68,9 +68,9 @@
6868
<Setter Property="HorizontalContentAlignment" Value="Left"/>
6969
<Setter Property="VerticalContentAlignment" Value="Center"/>
7070
<Setter Property="Background" Value="Transparent"/>
71-
<Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
71+
<Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}"/>
7272
<Setter Property="BorderThickness" Value="0,.5,0,0"/>
73-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
73+
<Setter Property="FocusVisualStyle" Value="{DynamicResource FocusVisual}"/>
7474
<Setter Property="Height" Value="26" />
7575
<Setter Property="Template">
7676
<Setter.Value>
@@ -83,26 +83,26 @@
8383
<MultiTrigger.Conditions>
8484
<Condition Property="IsMouseOver" Value="True"/>
8585
</MultiTrigger.Conditions>
86-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource MouseOverBackgroundBrush}"/>
87-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource MouseOverBorderBrush}"/>
86+
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource MouseOverBackgroundBrush}"/>
87+
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource MouseOverBorderBrush}"/>
8888
</MultiTrigger>
8989
<MultiTrigger>
9090
<MultiTrigger.Conditions>
9191
<Condition Property="Selector.IsSelectionActive" Value="False"/>
9292
<Condition Property="IsSelected" Value="True"/>
9393
</MultiTrigger.Conditions>
9494
<Setter Property="BorderThickness" Value="1.5" />
95-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
96-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource HighlightInactiveBorderBrush}"/>
95+
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource Item.SelectedInactive.Background}"/>
96+
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource HighlightInactiveBorderBrush}"/>
9797
</MultiTrigger>
9898
<MultiTrigger>
9999
<MultiTrigger.Conditions>
100100
<Condition Property="Selector.IsSelectionActive" Value="True"/>
101101
<Condition Property="IsSelected" Value="True"/>
102102
</MultiTrigger.Conditions>
103103
<Setter Property="BorderThickness" Value="1.5" />
104-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
105-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource HighlightBorderActiveBrush}"/>
104+
<Setter Property="Background" TargetName="Bd" Value="{DynamicResource Item.SelectedActive.Background}"/>
105+
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource HighlightBorderActiveBrush}"/>
106106
</MultiTrigger>
107107
<Trigger Property="IsEnabled" Value="False">
108108
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
@@ -126,7 +126,7 @@
126126
<ControlTemplate x:Name="TextBoxErrorTemplate">
127127
<Grid>
128128
<AdornedElementPlaceholder Grid.Row="0"/>
129-
<Image Source="{StaticResource InvalidTextImage}"
129+
<Image Source="{DynamicResource InvalidTextImage}"
130130
Height="16"
131131
Margin="0,-8,-8,0"
132132
HorizontalAlignment="Right"

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

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -50,73 +50,73 @@
5050
<Color x:Key="ToolBarMenuBorderColor">#FFB6BDC5</Color>
5151
<Color x:Key="ToolBarSubMenuBackgroundColor">#FFEEF5FD</Color>
5252

53-
<SolidColorBrush x:Key="HighlightGradientStartBrush" Color="{StaticResource HighlightGradientStartColor}"/>
54-
<SolidColorBrush x:Key="HighlightGradientEndBrush" Color="{StaticResource HighlightGradientEndColor}"/>
55-
<SolidColorBrush x:Key="ControlGradientStartBrush" Color="{StaticResource ControlGradientStartColor}"/>
56-
<SolidColorBrush x:Key="ControlGradientEndBrush" Color="{StaticResource ControlGradientEndColor}"/>
57-
<SolidColorBrush x:Key="ButtonFaceBrush" Color="{StaticResource ButtonFaceColor}"/>
58-
<SolidColorBrush x:Key="BorderWireBrush" Color="{StaticResource BorderWireColor}"/>
59-
<SolidColorBrush x:Key="GlyphPanelBrush" Color="{StaticResource GlyphPanelColor}"/>
60-
<SolidColorBrush x:Key="GlyphPanelTemplateBrush" Color="{StaticResource GlyphPanelTemplateColor}"/>
61-
<SolidColorBrush x:Key="GlyphPanelBorderBrush" Color="{StaticResource GlyphPanelBorderColor}"/>
62-
<SolidColorBrush x:Key="GreenButtonBrush" Color="{StaticResource GreenButtonColor}"/>
63-
<SolidColorBrush x:Key="GreenButtonBorderBrush" Color="{StaticResource GreenButtonBorderColor}"/>
64-
<SolidColorBrush x:Key="GreenButtonMouseOverBrush" Color="{StaticResource GreenButtonMouseOverColor}"/>
65-
<SolidColorBrush x:Key="HighlightBorderBrush" Color="{StaticResource HighlightBorderColor}"/>
66-
<SolidColorBrush x:Key="HighlightBorderActiveBrush" Color="{StaticResource HighlightBorderActiveColor}"/>
67-
<SolidColorBrush x:Key="HighlightBackgroundBrush" Color="{StaticResource HighlightBackgroundColor}"/>
68-
<SolidColorBrush x:Key="HighlightInactiveBorderBrush" Color="{StaticResource HighlightInactiveBorderColor}"/>
69-
<SolidColorBrush x:Key="GlyphPanelHighlightBorderBrush" Color="{StaticResource HighlightBorderColor}"/>
70-
<SolidColorBrush x:Key="GlyphPanelHighlightBackgroundBrush" Color="{StaticResource HighlightBackgroundColor}"/>
71-
<SolidColorBrush x:Key="MouseOverBackgroundBrush" Color="{StaticResource MouseOverBackgroundColor}"/>
72-
<SolidColorBrush x:Key="MouseOverBorderBrush" Color="{StaticResource MouseOverBorderColor}"/>
73-
<SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="{StaticResource ExpanderBackgroundColor}"/>
74-
<SolidColorBrush x:Key="ExpanderBorderBrush" Color="{StaticResource ExpanderBorderColor}"/>
75-
<SolidColorBrush x:Key="CaptionLightBrush" Color="{StaticResource CaptionLightColor}"/>
76-
<SolidColorBrush x:Key="CaptionDarkBrush" Color="{StaticResource CaptionDarkColor}"/>
77-
<SolidColorBrush x:Key="CaptionErrorBrush" Color="{StaticResource CaptionErrorColor}"/>
78-
<SolidColorBrush x:Key="CaptionDisabledBrush" Color="{StaticResource CaptionDisabledColor}"/>
79-
<SolidColorBrush x:Key="CaptionHyperlinkBrush" Color="{StaticResource CaptionHyperlinkColor}"/>
80-
<SolidColorBrush x:Key="CaptionHyperlinkVisitedBrush" Color="{StaticResource CaptionHyperlinkVisitedColor}"/>
81-
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{StaticResource BackgroundDarkColor}"/>
82-
<SolidColorBrush x:Key="BackgroundLightBrush" Color="{StaticResource BackgroundLightColor}"/>
83-
<SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{StaticResource BackgroundWhiteColor}"/>
84-
<SolidColorBrush x:Key="BackgroundSoftBrush" Color="{StaticResource BackgroundSoftColor}"/>
85-
<SolidColorBrush x:Key="HeaderBackgroundDarkBrush" Color="{StaticResource HeaderBackgroundDarkColor}"/>
86-
<SolidColorBrush x:Key="TabSelectionUnderlineBrush" Color="{StaticResource TabSelectionUnderlineColor}"/>
87-
<SolidColorBrush x:Key="GrayBrush" Color="{StaticResource GrayColor}"/>
88-
<SolidColorBrush x:Key="BlackBrush" Color="{StaticResource BlackColor}"/>
89-
<SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource WhiteColor}"/>
90-
<SolidColorBrush x:Key="BusyIndicatorFillBrush" Color="{StaticResource BusyIndicatorFillColor}"/>
53+
<SolidColorBrush x:Key="HighlightGradientStartBrush" Color="{DynamicResource HighlightGradientStartColor}"/>
54+
<SolidColorBrush x:Key="HighlightGradientEndBrush" Color="{DynamicResource HighlightGradientEndColor}"/>
55+
<SolidColorBrush x:Key="ControlGradientStartBrush" Color="{DynamicResource ControlGradientStartColor}"/>
56+
<SolidColorBrush x:Key="ControlGradientEndBrush" Color="{DynamicResource ControlGradientEndColor}"/>
57+
<SolidColorBrush x:Key="ButtonFaceBrush" Color="{DynamicResource ButtonFaceColor}"/>
58+
<SolidColorBrush x:Key="BorderWireBrush" Color="{DynamicResource BorderWireColor}"/>
59+
<SolidColorBrush x:Key="GlyphPanelBrush" Color="{DynamicResource GlyphPanelColor}"/>
60+
<SolidColorBrush x:Key="GlyphPanelTemplateBrush" Color="{DynamicResource GlyphPanelTemplateColor}"/>
61+
<SolidColorBrush x:Key="GlyphPanelBorderBrush" Color="{DynamicResource GlyphPanelBorderColor}"/>
62+
<SolidColorBrush x:Key="GreenButtonBrush" Color="{DynamicResource GreenButtonColor}"/>
63+
<SolidColorBrush x:Key="GreenButtonBorderBrush" Color="{DynamicResource GreenButtonBorderColor}"/>
64+
<SolidColorBrush x:Key="GreenButtonMouseOverBrush" Color="{DynamicResource GreenButtonMouseOverColor}"/>
65+
<SolidColorBrush x:Key="HighlightBorderBrush" Color="{DynamicResource HighlightBorderColor}"/>
66+
<SolidColorBrush x:Key="HighlightBorderActiveBrush" Color="{DynamicResource HighlightBorderActiveColor}"/>
67+
<SolidColorBrush x:Key="HighlightBackgroundBrush" Color="{DynamicResource HighlightBackgroundColor}"/>
68+
<SolidColorBrush x:Key="HighlightInactiveBorderBrush" Color="{DynamicResource HighlightInactiveBorderColor}"/>
69+
<SolidColorBrush x:Key="GlyphPanelHighlightBorderBrush" Color="{DynamicResource HighlightBorderColor}"/>
70+
<SolidColorBrush x:Key="GlyphPanelHighlightBackgroundBrush" Color="{DynamicResource HighlightBackgroundColor}"/>
71+
<SolidColorBrush x:Key="MouseOverBackgroundBrush" Color="{DynamicResource MouseOverBackgroundColor}"/>
72+
<SolidColorBrush x:Key="MouseOverBorderBrush" Color="{DynamicResource MouseOverBorderColor}"/>
73+
<SolidColorBrush x:Key="ExpanderBackgroundBrush" Color="{DynamicResource ExpanderBackgroundColor}"/>
74+
<SolidColorBrush x:Key="ExpanderBorderBrush" Color="{DynamicResource ExpanderBorderColor}"/>
75+
<SolidColorBrush x:Key="CaptionLightBrush" Color="{DynamicResource CaptionLightColor}"/>
76+
<SolidColorBrush x:Key="CaptionDarkBrush" Color="{DynamicResource CaptionDarkColor}"/>
77+
<SolidColorBrush x:Key="CaptionErrorBrush" Color="{DynamicResource CaptionErrorColor}"/>
78+
<SolidColorBrush x:Key="CaptionDisabledBrush" Color="{DynamicResource CaptionDisabledColor}"/>
79+
<SolidColorBrush x:Key="CaptionHyperlinkBrush" Color="{DynamicResource CaptionHyperlinkColor}"/>
80+
<SolidColorBrush x:Key="CaptionHyperlinkVisitedBrush" Color="{DynamicResource CaptionHyperlinkVisitedColor}"/>
81+
<SolidColorBrush x:Key="BackgroundDarkBrush" Color="{DynamicResource BackgroundDarkColor}"/>
82+
<SolidColorBrush x:Key="BackgroundLightBrush" Color="{DynamicResource BackgroundLightColor}"/>
83+
<SolidColorBrush x:Key="BackgroundWhiteBrush" Color="{DynamicResource BackgroundWhiteColor}"/>
84+
<SolidColorBrush x:Key="BackgroundSoftBrush" Color="{DynamicResource BackgroundSoftColor}"/>
85+
<SolidColorBrush x:Key="HeaderBackgroundDarkBrush" Color="{DynamicResource HeaderBackgroundDarkColor}"/>
86+
<SolidColorBrush x:Key="TabSelectionUnderlineBrush" Color="{DynamicResource TabSelectionUnderlineColor}"/>
87+
<SolidColorBrush x:Key="GrayBrush" Color="{DynamicResource GrayColor}"/>
88+
<SolidColorBrush x:Key="BlackBrush" Color="{DynamicResource BlackColor}"/>
89+
<SolidColorBrush x:Key="WhiteBrush" Color="{DynamicResource WhiteColor}"/>
90+
<SolidColorBrush x:Key="BusyIndicatorFillBrush" Color="{DynamicResource BusyIndicatorFillColor}"/>
9191

92-
<SolidColorBrush x:Key="ToolBarButtonHoverBrush" Color="{StaticResource ToolBarButtonHoverColor}"/>
93-
<SolidColorBrush x:Key="ToolBarGripperBrush" Color="{StaticResource ToolBarGripperColor}"/>
94-
<SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="{StaticResource ToolBarBackgroundColor}"/>
95-
<SolidColorBrush x:Key="ToolBarVerticalBackgroundBrush" Color="{StaticResource ToolBarVerticalBackgroundColor}"/>
96-
<SolidColorBrush x:Key="ToolBarHorizontalBackgroundBrush" Color="{StaticResource ToolBarHorizontalBackgroundColor}"/>
97-
<SolidColorBrush x:Key="ToolBarToggleButtonVerticalBackgroundBrush" Color="{StaticResource ToolBarToggleButtonVerticalBackgroundColor}"/>
98-
<SolidColorBrush x:Key="ToolBarToggleButtonHorizontalBackgroundBrush" Color="{StaticResource ToolBarToggleButtonHorizontalBackgroundColor}"/>
99-
<SolidColorBrush x:Key="ToolBarMenuBorderBrush" Color="{StaticResource ToolBarMenuBorderColor}"/>
100-
<SolidColorBrush x:Key="ToolBarSubMenuBackgroundBrush" Color="{StaticResource ToolBarSubMenuBackgroundColor}"/>
92+
<SolidColorBrush x:Key="ToolBarButtonHoverBrush" Color="{DynamicResource ToolBarButtonHoverColor}"/>
93+
<SolidColorBrush x:Key="ToolBarGripperBrush" Color="{DynamicResource ToolBarGripperColor}"/>
94+
<SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="{DynamicResource ToolBarBackgroundColor}"/>
95+
<SolidColorBrush x:Key="ToolBarVerticalBackgroundBrush" Color="{DynamicResource ToolBarVerticalBackgroundColor}"/>
96+
<SolidColorBrush x:Key="ToolBarHorizontalBackgroundBrush" Color="{DynamicResource ToolBarHorizontalBackgroundColor}"/>
97+
<SolidColorBrush x:Key="ToolBarToggleButtonVerticalBackgroundBrush" Color="{DynamicResource ToolBarToggleButtonVerticalBackgroundColor}"/>
98+
<SolidColorBrush x:Key="ToolBarToggleButtonHorizontalBackgroundBrush" Color="{DynamicResource ToolBarToggleButtonHorizontalBackgroundColor}"/>
99+
<SolidColorBrush x:Key="ToolBarMenuBorderBrush" Color="{DynamicResource ToolBarMenuBorderColor}"/>
100+
<SolidColorBrush x:Key="ToolBarSubMenuBackgroundBrush" Color="{DynamicResource ToolBarSubMenuBackgroundColor}"/>
101101

102-
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="{StaticResource WhiteColor}" />
103-
<SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource WhiteColor}" />
102+
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="{DynamicResource WhiteColor}" />
103+
<SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{DynamicResource WhiteColor}" />
104104

105105
<LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
106-
<GradientStop Color="{StaticResource HighlightGradientStartColor}" Offset="0"/>
107-
<GradientStop Color="{StaticResource HighlightGradientEndColor}" Offset="1"/>
106+
<GradientStop Color="{DynamicResource HighlightGradientStartColor}" Offset="0"/>
107+
<GradientStop Color="{DynamicResource HighlightGradientEndColor}" Offset="1"/>
108108
</LinearGradientBrush>
109109
<LinearGradientBrush x:Key="{x:Static SystemColors.ControlBrushKey}" EndPoint="0,1" StartPoint="0,0">
110-
<GradientStop Color="{StaticResource ControlGradientStartColor}" Offset="0"/>
111-
<GradientStop Color="{StaticResource ControlGradientEndColor}" Offset="1"/>
110+
<GradientStop Color="{DynamicResource ControlGradientStartColor}" Offset="0"/>
111+
<GradientStop Color="{DynamicResource ControlGradientEndColor}" Offset="1"/>
112112
</LinearGradientBrush>
113113

114114
<LinearGradientBrush x:Key="Item.SelectedActive.Background" EndPoint="0,1" StartPoint="0,0">
115-
<GradientStop Color="{StaticResource HighlightGradientStartColor}" Offset="0"/>
116-
<GradientStop Color="{StaticResource HighlightGradientEndColor}" Offset="1"/>
115+
<GradientStop Color="{DynamicResource HighlightGradientStartColor}" Offset="0"/>
116+
<GradientStop Color="{DynamicResource HighlightGradientEndColor}" Offset="1"/>
117117
</LinearGradientBrush>
118118
<LinearGradientBrush x:Key="Item.SelectedInactive.Background" EndPoint="0,1" StartPoint="0,0">
119-
<GradientStop Color="{StaticResource ControlGradientStartColor}" Offset="0"/>
120-
<GradientStop Color="{StaticResource ControlGradientEndColor}" Offset="1"/>
119+
<GradientStop Color="{DynamicResource ControlGradientStartColor}" Offset="0"/>
120+
<GradientStop Color="{DynamicResource ControlGradientEndColor}" Offset="1"/>
121121
</LinearGradientBrush>
122122
</ResourceDictionary>

0 commit comments

Comments
 (0)