|
226 | 226 | <Setter Property="Template"> |
227 | 227 | <Setter.Value> |
228 | 228 | <ControlTemplate TargetType="{x:Type Expander}"> |
229 | | - <Grid> |
| 229 | + <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}"> |
230 | 230 | <VisualStateManager.VisualStateGroups> |
231 | 231 | <VisualStateGroup x:Name="ExpansionStates"> |
232 | 232 | <VisualStateGroup.Transitions> |
|
271 | 271 | </VisualState> |
272 | 272 | </VisualStateGroup> |
273 | 273 | </VisualStateManager.VisualStateGroups> |
274 | | - <DockPanel Background="{TemplateBinding Background}"> |
275 | | - <ToggleButton Name="HeaderSite" |
276 | | - DockPanel.Dock="Top" |
277 | | - BorderThickness="0" Cursor="Hand" |
278 | | - IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" |
279 | | - Style="{StaticResource MaterialDesignExpanderDownHeaderStyle}" |
280 | | - TextElement.FontSize="15" |
281 | | - Opacity=".87" |
282 | | - Foreground="{TemplateBinding Foreground}" |
283 | | - Content="{TemplateBinding Header}" |
284 | | - ContentTemplate="{TemplateBinding HeaderTemplate}" |
285 | | - ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" |
286 | | - ContentStringFormat="{TemplateBinding HeaderStringFormat}"/> |
287 | | - <Border Name="ContentSite" |
288 | | - DockPanel.Dock="Bottom" > |
289 | | - <StackPanel Name="ContentPanel" |
290 | | - HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" |
291 | | - Margin="{TemplateBinding Padding}" |
292 | | - VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> |
293 | | - <StackPanel.Height> |
294 | | - <MultiBinding Converter="{StaticResource MathMlpMultipleConverter}"> |
295 | | - <Binding ElementName="PART_Content" Path="ActualHeight"/> |
296 | | - <Binding ElementName="PART_Content" Path="Opacity"/> |
297 | | - </MultiBinding> |
298 | | - </StackPanel.Height> |
299 | | - <StackPanel.Width> |
300 | | - <MultiBinding Converter="{StaticResource MathMlpMultipleConverter}"> |
301 | | - <Binding ElementName="PART_Content" Path="ActualWidth"/> |
302 | | - <Binding ElementName="PART_Content" Path="Opacity"/> |
303 | | - </MultiBinding> |
304 | | - </StackPanel.Width> |
305 | | - <ContentPresenter Name="PART_Content" Focusable="False" |
306 | | - ContentTemplate="{TemplateBinding ContentTemplate}" |
307 | | - ContentStringFormat="{TemplateBinding ContentStringFormat}" |
308 | | - ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/> |
309 | | - </StackPanel> |
310 | | - </Border> |
311 | | - </DockPanel> |
312 | | - </Grid> |
| 274 | + <Grid> |
| 275 | + <DockPanel Background="{TemplateBinding Background}"> |
| 276 | + <ToggleButton Name="HeaderSite" |
| 277 | + DockPanel.Dock="Top" |
| 278 | + BorderThickness="0" Cursor="Hand" |
| 279 | + IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" |
| 280 | + Style="{StaticResource MaterialDesignExpanderDownHeaderStyle}" |
| 281 | + TextElement.FontSize="15" |
| 282 | + Opacity=".87" |
| 283 | + Foreground="{TemplateBinding Foreground}" |
| 284 | + Content="{TemplateBinding Header}" |
| 285 | + ContentTemplate="{TemplateBinding HeaderTemplate}" |
| 286 | + ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" |
| 287 | + ContentStringFormat="{TemplateBinding HeaderStringFormat}"/> |
| 288 | + <Border Name="ContentSite" |
| 289 | + DockPanel.Dock="Bottom" > |
| 290 | + <StackPanel Name="ContentPanel" |
| 291 | + HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" |
| 292 | + Margin="{TemplateBinding Padding}" |
| 293 | + VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> |
| 294 | + <StackPanel.Height> |
| 295 | + <MultiBinding Converter="{StaticResource MathMlpMultipleConverter}"> |
| 296 | + <Binding ElementName="PART_Content" Path="ActualHeight"/> |
| 297 | + <Binding ElementName="PART_Content" Path="Opacity"/> |
| 298 | + </MultiBinding> |
| 299 | + </StackPanel.Height> |
| 300 | + <StackPanel.Width> |
| 301 | + <MultiBinding Converter="{StaticResource MathMlpMultipleConverter}"> |
| 302 | + <Binding ElementName="PART_Content" Path="ActualWidth"/> |
| 303 | + <Binding ElementName="PART_Content" Path="Opacity"/> |
| 304 | + </MultiBinding> |
| 305 | + </StackPanel.Width> |
| 306 | + <ContentPresenter Name="PART_Content" Focusable="False" |
| 307 | + ContentTemplate="{TemplateBinding ContentTemplate}" |
| 308 | + ContentStringFormat="{TemplateBinding ContentStringFormat}" |
| 309 | + ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/> |
| 310 | + </StackPanel> |
| 311 | + </Border> |
| 312 | + </DockPanel> |
| 313 | + </Grid> |
| 314 | + </Border> |
313 | 315 | <ControlTemplate.Triggers> |
314 | 316 | <Trigger Property="ExpandDirection" Value="Right"> |
315 | 317 | <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/> |
|
0 commit comments