Skip to content

Commit da7546d

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'spiegelp-ExpansionPanel'
2 parents 944e529 + 326c747 commit da7546d

File tree

2 files changed

+76
-72
lines changed

2 files changed

+76
-72
lines changed

‎MainDemo.Wpf/Expander.xaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Header="Expander Example 1a">
2121
<StackPanel Orientation="Vertical"
2222
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
23-
Margin="16">
23+
Margin="24,8,24,16">
2424
<TextBlock Text="Your Content" />
2525
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
2626
TextWrapping="Wrap"/>
@@ -30,7 +30,7 @@
3030
Header="Expander Example 1b">
3131
<StackPanel Orientation="Vertical"
3232
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
33-
Margin="16">
33+
Margin="24,8,24,16">
3434
<TextBlock Text="Your Content" />
3535
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
3636
TextWrapping="Wrap"/>
@@ -40,7 +40,7 @@
4040
Header="Expander Example 1c">
4141
<StackPanel Orientation="Vertical"
4242
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
43-
Margin="16">
43+
Margin="24,8,24,16">
4444
<TextBlock Text="Your Content" />
4545
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
4646
TextWrapping="Wrap"/>
@@ -54,27 +54,29 @@
5454
Header="Expander Example 2a">
5555
<StackPanel Orientation="Vertical"
5656
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
57-
Margin="16">
57+
Margin="24,8,24,16">
5858
<TextBlock Text="Your Content" />
5959
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
6060
TextWrapping="Wrap"/>
6161
</StackPanel>
6262
</Expander>
63+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
6364
<Expander HorizontalAlignment="Stretch"
6465
Header="Expander Example 2b">
6566
<StackPanel Orientation="Vertical"
6667
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
67-
Margin="16">
68+
Margin="24,8,24,16">
6869
<TextBlock Text="Your Content" />
6970
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
7071
TextWrapping="Wrap"/>
7172
</StackPanel>
7273
</Expander>
74+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
7375
<Expander HorizontalAlignment="Stretch"
7476
Header="Expander Example 2c">
7577
<StackPanel Orientation="Vertical"
7678
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
77-
Margin="16">
79+
Margin="24,8,24,16">
7880
<TextBlock Text="Your Content" />
7981
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
8082
TextWrapping="Wrap"/>
@@ -94,13 +96,14 @@
9496
</Expander.Header>
9597
<StackPanel Orientation="Vertical"
9698
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
97-
Margin="16">
99+
Margin="8,24,16,24">
98100
<TextBlock Text="Your Content" />
99101
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
100102
MaxWidth="180"
101103
TextWrapping="Wrap"/>
102104
</StackPanel>
103105
</Expander>
106+
<Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
104107
<Expander ExpandDirection="Right">
105108
<Expander.Header>
106109
<TextBlock Text="Expander Example 3b" RenderTransformOrigin=".5,.5">
@@ -111,13 +114,14 @@
111114
</Expander.Header>
112115
<StackPanel Orientation="Vertical"
113116
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
114-
Margin="16">
117+
Margin="8,24,16,24">
115118
<TextBlock Text="Your Content" />
116119
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
117120
MaxWidth="180"
118121
TextWrapping="Wrap"/>
119122
</StackPanel>
120123
</Expander>
124+
<Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
121125
<Expander ExpandDirection="Right">
122126
<Expander.Header>
123127
<TextBlock Text="Expander Example 3c" RenderTransformOrigin=".5,.5">
@@ -128,7 +132,7 @@
128132
</Expander.Header>
129133
<StackPanel Orientation="Vertical"
130134
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
131-
Margin="16">
135+
Margin="8,24,16,24">
132136
<TextBlock Text="Your Content" />
133137
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
134138
MaxWidth="180"

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -93,28 +93,28 @@
9393
<Setter Property="Template">
9494
<Setter.Value>
9595
<ControlTemplate TargetType="{x:Type ToggleButton}">
96-
<Grid>
97-
<Grid.RowDefinitions>
98-
<RowDefinition Height="Auto"/>
99-
<RowDefinition />
100-
</Grid.RowDefinitions>
101-
<ToggleButton Grid.Row="0"
102-
Margin="0 16 0 16"
96+
<Border Background="{TemplateBinding Background}" Padding="12,24,12,24">
97+
<Grid>
98+
<Grid.RowDefinitions>
99+
<RowDefinition Height="Auto"/>
100+
<RowDefinition />
101+
</Grid.RowDefinitions>
102+
<ToggleButton Grid.Row="0"
103103
HorizontalAlignment="Center"
104104
Foreground="{TemplateBinding Foreground}"
105105
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
106106
Style="{StaticResource MaterialDesignExpanderToggleButton}"
107107
RenderTransformOrigin="0.5,0.5">
108-
<ToggleButton.RenderTransform>
109-
<RotateTransform Angle="-90"/>
110-
</ToggleButton.RenderTransform>
111-
</ToggleButton>
112-
<ContentPresenter Grid.Row="1"
108+
<ToggleButton.RenderTransform>
109+
<RotateTransform Angle="-90"/>
110+
</ToggleButton.RenderTransform>
111+
</ToggleButton>
112+
<ContentPresenter Grid.Row="1"
113113
HorizontalAlignment="Center"
114-
Margin="16 16 16 0"
114+
Margin="0,16,0,0"
115115
Content="{TemplateBinding Content}" VerticalAlignment="Top" />
116-
<Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 1 0" Grid.RowSpan="2" />
117-
</Grid>
116+
</Grid>
117+
</Border>
118118
</ControlTemplate>
119119
</Setter.Value>
120120
</Setter>
@@ -127,28 +127,28 @@
127127
<Setter Property="Template">
128128
<Setter.Value>
129129
<ControlTemplate TargetType="{x:Type ToggleButton}">
130-
<Grid>
131-
<Grid.RowDefinitions>
132-
<RowDefinition Height="Auto"/>
133-
<RowDefinition />
134-
</Grid.RowDefinitions>
135-
<ToggleButton Grid.Row="0"
136-
Margin="0 16 0 16"
130+
<Border Background="{TemplateBinding Background}" Padding="12,24,12,24">
131+
<Grid>
132+
<Grid.RowDefinitions>
133+
<RowDefinition Height="Auto"/>
134+
<RowDefinition />
135+
</Grid.RowDefinitions>
136+
<ToggleButton Grid.Row="0"
137137
HorizontalAlignment="Center"
138138
Foreground="{TemplateBinding Foreground}"
139139
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
140140
Style="{StaticResource MaterialDesignExpanderToggleButton}"
141141
RenderTransformOrigin="0.5,0.5">
142-
<ToggleButton.RenderTransform>
143-
<RotateTransform Angle="90"/>
144-
</ToggleButton.RenderTransform>
145-
</ToggleButton>
146-
<ContentPresenter Grid.Row="1"
142+
<ToggleButton.RenderTransform>
143+
<RotateTransform Angle="90"/>
144+
</ToggleButton.RenderTransform>
145+
</ToggleButton>
146+
<ContentPresenter Grid.Row="1"
147147
HorizontalAlignment="Center"
148-
Margin="16 16 16 0"
148+
Margin="0,16,0,0"
149149
Content="{TemplateBinding Content}" VerticalAlignment="Top" />
150-
<Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="1 0 0 0" Grid.RowSpan="2" />
151-
</Grid>
150+
</Grid>
151+
</Border>
152152
</ControlTemplate>
153153
</Setter.Value>
154154
</Setter>
@@ -161,25 +161,25 @@
161161
<Setter Property="Template">
162162
<Setter.Value>
163163
<ControlTemplate TargetType="{x:Type ToggleButton}">
164-
<Grid>
165-
<Grid.ColumnDefinitions>
166-
<ColumnDefinition />
167-
<ColumnDefinition Width="Auto"/>
168-
</Grid.ColumnDefinitions>
169-
<ContentPresenter Content="{TemplateBinding Content}"
170-
ContentTemplate="{TemplateBinding ContentTemplate}"
171-
ContentStringFormat="{TemplateBinding ContentStringFormat}"
172-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
164+
<Border Background="{TemplateBinding Background}" Padding="24,12,24,12">
165+
<Grid>
166+
<Grid.ColumnDefinitions>
167+
<ColumnDefinition />
168+
<ColumnDefinition Width="Auto"/>
169+
</Grid.ColumnDefinitions>
170+
<ContentPresenter Content="{TemplateBinding Content}"
171+
ContentTemplate="{TemplateBinding ContentTemplate}"
172+
ContentStringFormat="{TemplateBinding ContentStringFormat}"
173+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
174+
VerticalAlignment="Center"
175+
Margin="0,0,16,0" />
176+
<ToggleButton Grid.Column="1"
173177
VerticalAlignment="Center"
174-
Margin="16 16 0 16" />
175-
<ToggleButton Grid.Column="1"
176-
Margin="16 0 16 0"
177-
VerticalAlignment="Center"
178-
Foreground="{TemplateBinding Foreground}"
179-
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
180-
Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
181-
<Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" SnapsToDevicePixels="True" />
182-
</Grid>
178+
Foreground="{TemplateBinding Foreground}"
179+
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
180+
Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
181+
</Grid>
182+
</Border>
183183
</ControlTemplate>
184184
</Setter.Value>
185185
</Setter>
@@ -192,27 +192,27 @@
192192
<Setter Property="Template">
193193
<Setter.Value>
194194
<ControlTemplate TargetType="{x:Type ToggleButton}">
195-
<Grid>
196-
<Grid.ColumnDefinitions>
197-
<ColumnDefinition />
198-
<ColumnDefinition Width="Auto"/>
199-
</Grid.ColumnDefinitions>
200-
<ContentPresenter VerticalAlignment="Center"
195+
<Border Background="{TemplateBinding Background}" Padding="24,12,24,12">
196+
<Grid>
197+
<Grid.ColumnDefinitions>
198+
<ColumnDefinition />
199+
<ColumnDefinition Width="Auto"/>
200+
</Grid.ColumnDefinitions>
201+
<ContentPresenter VerticalAlignment="Center"
201202
Content="{TemplateBinding Content}"
202-
Margin="16 16 0 16" />
203-
<ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
204-
Margin="16 0 16 0"
203+
Margin="0,0,16,0" />
204+
<ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
205205
VerticalAlignment="Center"
206206
Foreground="{TemplateBinding Foreground}"
207207
Style="{StaticResource MaterialDesignExpanderToggleButton}"
208208
RenderTransformOrigin="0.5,0.5"
209209
Grid.Column="1">
210-
<ToggleButton.RenderTransform>
211-
<RotateTransform Angle="-180"/>
212-
</ToggleButton.RenderTransform>
213-
</ToggleButton>
214-
<Border BorderBrush="{DynamicResource MaterialDesignDivider}" BorderThickness="0 0 0 1" Grid.ColumnSpan="2" />
215-
</Grid>
210+
<ToggleButton.RenderTransform>
211+
<RotateTransform Angle="-180"/>
212+
</ToggleButton.RenderTransform>
213+
</ToggleButton>
214+
</Grid>
215+
</Border>
216216
</ControlTemplate>
217217
</Setter.Value>
218218
</Setter>

0 commit comments

Comments
 (0)