Skip to content

Commit 06f492b

Browse files
committed
Make expander style names a bit less generic to avoid any fyure conflict.
1 parent 1a4a1c6 commit 06f492b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</Setter>
9393
</Style>
9494

95-
<Style x:Key="MaterialDesignRightHeaderStyle" TargetType="{x:Type ToggleButton}">
95+
<Style x:Key="MaterialDesignExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
9696
<Setter Property="Background" Value="Transparent" />
9797
<Setter Property="HorizontalAlignment" Value="Left" />
9898
<Setter Property="VerticalAlignment" Value="Stretch" />
@@ -122,7 +122,7 @@
122122
</Setter>
123123
</Style>
124124

125-
<Style x:Key="MaterialDesignLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
125+
<Style x:Key="MaterialDesignExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
126126
<Setter Property="Background" Value="Transparent" />
127127
<Setter Property="HorizontalAlignment" Value="Left" />
128128
<Setter Property="VerticalAlignment" Value="Stretch" />
@@ -152,7 +152,7 @@
152152
</Setter>
153153
</Style>
154154

155-
<Style x:Key="MaterialDesignDownHeaderStyle" TargetType="{x:Type ToggleButton}">
155+
<Style x:Key="MaterialDesignExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
156156
<Setter Property="Background" Value="Transparent" />
157157
<Setter Property="HorizontalAlignment" Value="Stretch" />
158158
<Setter Property="VerticalAlignment" Value="Center" />
@@ -179,7 +179,7 @@
179179
</Setter>
180180
</Style>
181181

182-
<Style x:Key="MaterialDesignUpHeaderStyle" TargetType="{x:Type ToggleButton}">
182+
<Style x:Key="MaterialDesignExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
183183
<Setter Property="Background" Value="Transparent" />
184184
<Setter Property="HorizontalAlignment" Value="Stretch" />
185185
<Setter Property="VerticalAlignment" Value="Center" />
@@ -275,7 +275,7 @@
275275
BorderThickness="0" Cursor="Hand"
276276
MinHeight="25"
277277
IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
278-
Style="{StaticResource MaterialDesignDownHeaderStyle}"
278+
Style="{StaticResource MaterialDesignExpanderDownHeaderStyle}"
279279
Content="{TemplateBinding Header}"
280280
ContentTemplate="{TemplateBinding HeaderTemplate}"
281281
ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -314,15 +314,15 @@
314314
<Setter Property="Orientation" TargetName="ContentPanel" Value="Horizontal"/>
315315
<!--Setter Property="MinWidth" TargetName="ContentSite" Value="{Binding ElementName=PART_Content, Path=ActualWidth}"/-->
316316
<Setter Property="Height" TargetName="ContentPanel" Value="Auto"/>
317-
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignRightHeaderStyle}"/>
317+
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignExpanderRightHeaderStyle}"/>
318318
</Trigger>
319319

320320
<Trigger Property="ExpandDirection" Value="Left">
321321
<Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
322322
<Setter Property="DockPanel.Dock" TargetName="ContentSite" Value="Left"/>
323323
<Setter Property="Orientation" TargetName="ContentPanel" Value="Horizontal"/>
324324
<Setter Property="Height" TargetName="ContentPanel" Value="Auto"/>
325-
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignLeftHeaderStyle}"/>
325+
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignExpanderLeftHeaderStyle}"/>
326326
</Trigger>
327327

328328
<Trigger Property="ExpandDirection" Value="Up">
@@ -331,15 +331,15 @@
331331
<!--Setter Property="MinHeight" TargetName="ContentSite" Value="{Binding ElementName=PART_Content, Path=ActualHeight}"/-->
332332
<Setter Property="Orientation" TargetName="ContentPanel" Value="Vertical"/>
333333
<Setter Property="Width" TargetName="ContentPanel" Value="Auto"/>
334-
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignUpHeaderStyle}"/>
334+
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignExpanderUpHeaderStyle}"/>
335335
</Trigger>
336336

337337
<Trigger Property="ExpandDirection" Value="Down">
338338
<Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Top"/>
339339
<Setter Property="DockPanel.Dock" TargetName="ContentSite" Value="Bottom"/>
340340
<Setter Property="Orientation" TargetName="ContentPanel" Value="Vertical"/>
341341
<Setter Property="Width" TargetName="ContentPanel" Value="Auto"/>
342-
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignDownHeaderStyle}"/>
342+
<Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource MaterialDesignExpanderDownHeaderStyle}"/>
343343
</Trigger>
344344
</ControlTemplate.Triggers>
345345
</ControlTemplate>

0 commit comments

Comments
 (0)