Skip to content

Commit dd0215b

Browse files
bclothierbclothier
committed
Consolidate some more styles
1 parent 2a891c8 commit dd0215b

File tree

4 files changed

+66
-190
lines changed

4 files changed

+66
-190
lines changed

‎Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersView.xaml

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -20,71 +20,8 @@
2020
<BitmapImage x:Key="RemoveParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-script.png" />
2121
<BitmapImage x:Key="RestoreParameterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-return-180-left.png" />
2222

23-
<Style x:Key="FocusVisual">
24-
<Setter Property="Control.Template">
25-
<Setter.Value>
26-
<ControlTemplate>
27-
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
28-
</ControlTemplate>
29-
</Setter.Value>
30-
</Setter>
31-
</Style>
32-
3323
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
34-
<Style.Resources>
35-
<Style TargetType="{x:Type Border}">
36-
<Setter Property="CornerRadius" Value="2"/>
37-
</Style>
38-
</Style.Resources>
39-
<Setter Property="SnapsToDevicePixels" Value="True"/>
40-
<Setter Property="Padding" Value="4,1"/>
41-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
42-
<Setter Property="VerticalContentAlignment" Value="Center"/>
43-
<Setter Property="Background" Value="Transparent"/>
44-
<Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
45-
<Setter Property="BorderThickness" Value="0,.5,0,0"/>
46-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
47-
<Setter Property="Height" Value="26" />
4824
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
49-
<Setter Property="Template">
50-
<Setter.Value>
51-
<ControlTemplate TargetType="{x:Type ListBoxItem}">
52-
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
53-
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
54-
</Border>
55-
<ControlTemplate.Triggers>
56-
<MultiTrigger>
57-
<MultiTrigger.Conditions>
58-
<Condition Property="IsMouseOver" Value="True"/>
59-
</MultiTrigger.Conditions>
60-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
61-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
62-
</MultiTrigger>
63-
<MultiTrigger>
64-
<MultiTrigger.Conditions>
65-
<Condition Property="Selector.IsSelectionActive" Value="False"/>
66-
<Condition Property="IsSelected" Value="True"/>
67-
</MultiTrigger.Conditions>
68-
<Setter Property="BorderThickness" Value="1.5" />
69-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
70-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
71-
</MultiTrigger>
72-
<MultiTrigger>
73-
<MultiTrigger.Conditions>
74-
<Condition Property="Selector.IsSelectionActive" Value="True"/>
75-
<Condition Property="IsSelected" Value="True"/>
76-
</MultiTrigger.Conditions>
77-
<Setter Property="BorderThickness" Value="1.5" />
78-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
79-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
80-
</MultiTrigger>
81-
<Trigger Property="IsEnabled" Value="False">
82-
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
83-
</Trigger>
84-
</ControlTemplate.Triggers>
85-
</ControlTemplate>
86-
</Setter.Value>
87-
</Setter>
8825
</Style>
8926
</ResourceDictionary>
9027
</UserControl.Resources>

‎Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersView.xaml

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -18,72 +18,6 @@
1818

1919
<BitmapImage x:Key="MoveUpImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-090.png" />
2020
<BitmapImage x:Key="MoveDownImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/arrow-270.png" />
21-
22-
<Style x:Key="FocusVisual">
23-
<Setter Property="Control.Template">
24-
<Setter.Value>
25-
<ControlTemplate>
26-
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
27-
</ControlTemplate>
28-
</Setter.Value>
29-
</Setter>
30-
</Style>
31-
32-
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
33-
<Style.Resources>
34-
<Style TargetType="{x:Type Border}">
35-
<Setter Property="CornerRadius" Value="2"/>
36-
</Style>
37-
</Style.Resources>
38-
<Setter Property="SnapsToDevicePixels" Value="True"/>
39-
<Setter Property="Padding" Value="4,1"/>
40-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
41-
<Setter Property="VerticalContentAlignment" Value="Center"/>
42-
<Setter Property="Background" Value="Transparent"/>
43-
<Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
44-
<Setter Property="BorderThickness" Value="0,.5,0,0"/>
45-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
46-
<Setter Property="Height" Value="26" />
47-
<Setter Property="Template">
48-
<Setter.Value>
49-
<ControlTemplate TargetType="{x:Type ListBoxItem}">
50-
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
51-
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
52-
</Border>
53-
<ControlTemplate.Triggers>
54-
<MultiTrigger>
55-
<MultiTrigger.Conditions>
56-
<Condition Property="IsMouseOver" Value="True"/>
57-
</MultiTrigger.Conditions>
58-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
59-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
60-
</MultiTrigger>
61-
<MultiTrigger>
62-
<MultiTrigger.Conditions>
63-
<Condition Property="Selector.IsSelectionActive" Value="False"/>
64-
<Condition Property="IsSelected" Value="True"/>
65-
</MultiTrigger.Conditions>
66-
<Setter Property="BorderThickness" Value="1.5" />
67-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
68-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
69-
</MultiTrigger>
70-
<MultiTrigger>
71-
<MultiTrigger.Conditions>
72-
<Condition Property="Selector.IsSelectionActive" Value="True"/>
73-
<Condition Property="IsSelected" Value="True"/>
74-
</MultiTrigger.Conditions>
75-
<Setter Property="BorderThickness" Value="1.5" />
76-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
77-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
78-
</MultiTrigger>
79-
<Trigger Property="IsEnabled" Value="False">
80-
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
81-
</Trigger>
82-
</ControlTemplate.Triggers>
83-
</ControlTemplate>
84-
</Setter.Value>
85-
</Setter>
86-
</Style>
8721
</ResourceDictionary>
8822
</UserControl.Resources>
8923
<Grid>

‎Rubberduck.Core/UI/Settings/SettingsControl.xaml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -18,70 +18,9 @@
1818
</ResourceDictionary.MergedDictionaries>
1919
<converters:SettingsViewToPageConverter x:Key="SettingsViewToPage" />
2020

21-
<Style x:Key="FocusVisual">
22-
<Setter Property="Control.Template">
23-
<Setter.Value>
24-
<ControlTemplate>
25-
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
26-
</ControlTemplate>
27-
</Setter.Value>
28-
</Setter>
29-
</Style>
30-
3121
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
32-
<Style.Resources>
33-
<Style TargetType="{x:Type Border}">
34-
<Setter Property="CornerRadius" Value="2"/>
35-
</Style>
36-
</Style.Resources>
37-
<Setter Property="SnapsToDevicePixels" Value="True"/>
38-
<Setter Property="Padding" Value="4,1"/>
39-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
40-
<Setter Property="VerticalContentAlignment" Value="Center"/>
41-
<Setter Property="Background" Value="Transparent"/>
4222
<Setter Property="BorderBrush" Value="Transparent"/>
4323
<Setter Property="BorderThickness" Value="0"/>
44-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
45-
<Setter Property="Height" Value="26" />
46-
<Setter Property="Template">
47-
<Setter.Value>
48-
<ControlTemplate TargetType="{x:Type ListBoxItem}">
49-
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
50-
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
51-
</Border>
52-
<ControlTemplate.Triggers>
53-
<MultiTrigger>
54-
<MultiTrigger.Conditions>
55-
<Condition Property="IsMouseOver" Value="True"/>
56-
</MultiTrigger.Conditions>
57-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
58-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
59-
</MultiTrigger>
60-
<MultiTrigger>
61-
<MultiTrigger.Conditions>
62-
<Condition Property="Selector.IsSelectionActive" Value="False"/>
63-
<Condition Property="IsSelected" Value="True"/>
64-
</MultiTrigger.Conditions>
65-
<Setter Property="BorderThickness" Value="1.5" />
66-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
67-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
68-
</MultiTrigger>
69-
<MultiTrigger>
70-
<MultiTrigger.Conditions>
71-
<Condition Property="Selector.IsSelectionActive" Value="True"/>
72-
<Condition Property="IsSelected" Value="True"/>
73-
</MultiTrigger.Conditions>
74-
<Setter Property="BorderThickness" Value="1.5" />
75-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
76-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
77-
</MultiTrigger>
78-
<Trigger Property="IsEnabled" Value="False">
79-
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
80-
</Trigger>
81-
</ControlTemplate.Triggers>
82-
</ControlTemplate>
83-
</Setter.Value>
84-
</Setter>
8524
</Style>
8625
</ResourceDictionary>
8726
</UserControl.Resources>

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,72 @@
149149
</MultiTrigger>
150150
</Style.Triggers>
151151
</Style>
152+
153+
<Style x:Key="PrettyListBoxItem" TargetType="{x:Type ListBoxItem}">
154+
<Style.Resources>
155+
<Style TargetType="{x:Type Border}">
156+
<Setter Property="CornerRadius" Value="2"/>
157+
</Style>
158+
</Style.Resources>
159+
<Setter Property="SnapsToDevicePixels" Value="True"/>
160+
<Setter Property="Padding" Value="4,1"/>
161+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
162+
<Setter Property="VerticalContentAlignment" Value="Center"/>
163+
<Setter Property="Background" Value="Transparent"/>
164+
<Setter Property="BorderBrush" Value="{StaticResource BlackBrush}"/>
165+
<Setter Property="BorderThickness" Value="0,.5,0,0"/>
166+
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
167+
<Setter Property="Height" Value="26" />
168+
<Setter Property="Template">
169+
<Setter.Value>
170+
<ControlTemplate TargetType="{x:Type ListBoxItem}">
171+
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
172+
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
173+
</Border>
174+
<ControlTemplate.Triggers>
175+
<MultiTrigger>
176+
<MultiTrigger.Conditions>
177+
<Condition Property="IsMouseOver" Value="True"/>
178+
</MultiTrigger.Conditions>
179+
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
180+
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
181+
</MultiTrigger>
182+
<MultiTrigger>
183+
<MultiTrigger.Conditions>
184+
<Condition Property="Selector.IsSelectionActive" Value="False"/>
185+
<Condition Property="IsSelected" Value="True"/>
186+
</MultiTrigger.Conditions>
187+
<Setter Property="BorderThickness" Value="1.5" />
188+
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
189+
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
190+
</MultiTrigger>
191+
<MultiTrigger>
192+
<MultiTrigger.Conditions>
193+
<Condition Property="Selector.IsSelectionActive" Value="True"/>
194+
<Condition Property="IsSelected" Value="True"/>
195+
</MultiTrigger.Conditions>
196+
<Setter Property="BorderThickness" Value="1.5" />
197+
<Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
198+
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
199+
</MultiTrigger>
200+
<Trigger Property="IsEnabled" Value="False">
201+
<Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
202+
</Trigger>
203+
</ControlTemplate.Triggers>
204+
</ControlTemplate>
205+
</Setter.Value>
206+
</Setter>
207+
</Style>
208+
209+
<Style x:Key="FocusVisual">
210+
<Setter Property="Control.Template">
211+
<Setter.Value>
212+
<ControlTemplate>
213+
<Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
214+
</ControlTemplate>
215+
</Setter.Value>
216+
</Setter>
217+
</Style>
152218

153219
<Style TargetType="ScrollViewer">
154220
<Style.Setters>

0 commit comments

Comments
 (0)