Skip to content

Commit 988d344

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'ExpansionPanel' of https://github.com/spiegelp/MaterialDesignInXamlToolkit into spiegelp-ExpansionPanel
2 parents 0109f7b + fafa5ce commit 988d344

File tree

2 files changed

+78
-72
lines changed

2 files changed

+78
-72
lines changed

‎MainDemo.Wpf/Expander.xaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,29 @@
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"/>
2727
</StackPanel>
2828
</Expander>
29+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
2930
<Expander HorizontalAlignment="Stretch"
3031
Header="Expander Example 1b">
3132
<StackPanel Orientation="Vertical"
3233
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
33-
Margin="16">
34+
Margin="24,8,24,16">
3435
<TextBlock Text="Your Content" />
3536
<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."
3637
TextWrapping="Wrap"/>
3738
</StackPanel>
3839
</Expander>
40+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
3941
<Expander HorizontalAlignment="Stretch"
4042
Header="Expander Example 1c">
4143
<StackPanel Orientation="Vertical"
4244
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
43-
Margin="16">
45+
Margin="24,8,24,16">
4446
<TextBlock Text="Your Content" />
4547
<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."
4648
TextWrapping="Wrap"/>
@@ -54,27 +56,29 @@
5456
Header="Expander Example 2a">
5557
<StackPanel Orientation="Vertical"
5658
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
57-
Margin="16">
59+
Margin="24,8,24,16">
5860
<TextBlock Text="Your Content" />
5961
<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."
6062
TextWrapping="Wrap"/>
6163
</StackPanel>
6264
</Expander>
65+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
6366
<Expander HorizontalAlignment="Stretch"
6467
Header="Expander Example 2b">
6568
<StackPanel Orientation="Vertical"
6669
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
67-
Margin="16">
70+
Margin="24,8,24,16">
6871
<TextBlock Text="Your Content" />
6972
<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."
7073
TextWrapping="Wrap"/>
7174
</StackPanel>
7275
</Expander>
76+
<Border Background="{DynamicResource MaterialDesignDivider}" Height="1" HorizontalAlignment="Stretch" SnapsToDevicePixels="True" />
7377
<Expander HorizontalAlignment="Stretch"
7478
Header="Expander Example 2c">
7579
<StackPanel Orientation="Vertical"
7680
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
77-
Margin="16">
81+
Margin="24,8,24,16">
7882
<TextBlock Text="Your Content" />
7983
<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."
8084
TextWrapping="Wrap"/>
@@ -94,13 +98,14 @@
9498
</Expander.Header>
9599
<StackPanel Orientation="Vertical"
96100
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
97-
Margin="16">
101+
Margin="8,24,16,24">
98102
<TextBlock Text="Your Content" />
99103
<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."
100104
MaxWidth="180"
101105
TextWrapping="Wrap"/>
102106
</StackPanel>
103107
</Expander>
108+
<Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
104109
<Expander ExpandDirection="Right">
105110
<Expander.Header>
106111
<TextBlock Text="Expander Example 3b" RenderTransformOrigin=".5,.5">
@@ -111,13 +116,14 @@
111116
</Expander.Header>
112117
<StackPanel Orientation="Vertical"
113118
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
114-
Margin="16">
119+
Margin="8,24,16,24">
115120
<TextBlock Text="Your Content" />
116121
<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."
117122
MaxWidth="180"
118123
TextWrapping="Wrap"/>
119124
</StackPanel>
120125
</Expander>
126+
<Border Background="{DynamicResource MaterialDesignDivider}" Width="1" VerticalAlignment="Stretch" SnapsToDevicePixels="True" />
121127
<Expander ExpandDirection="Right">
122128
<Expander.Header>
123129
<TextBlock Text="Expander Example 3c" RenderTransformOrigin=".5,.5">
@@ -128,7 +134,7 @@
128134
</Expander.Header>
129135
<StackPanel Orientation="Vertical"
130136
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
131-
Margin="16">
137+
Margin="8,24,16,24">
132138
<TextBlock Text="Your Content" />
133139
<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."
134140
MaxWidth="180"

0 commit comments

Comments
 (0)