Skip to content

Commit 1178a9b

Browse files
spiegelpspiegelp
committed
corrected layout for the Expansion Panel header (horizontal margin 24 instead of 16) and extend clickable area
1 parent 8c7b2e5 commit 1178a9b

File tree

1 file changed

+63
-59
lines changed

1 file changed

+63
-59
lines changed

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

Lines changed: 63 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +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="16,24,16,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-
</Grid>
116+
</Grid>
117+
</Border>
117118
</ControlTemplate>
118119
</Setter.Value>
119120
</Setter>
@@ -126,27 +127,28 @@
126127
<Setter Property="Template">
127128
<Setter.Value>
128129
<ControlTemplate TargetType="{x:Type ToggleButton}">
129-
<Grid>
130-
<Grid.RowDefinitions>
131-
<RowDefinition Height="Auto"/>
132-
<RowDefinition />
133-
</Grid.RowDefinitions>
134-
<ToggleButton Grid.Row="0"
135-
Margin="0 16 0 16"
130+
<Border Background="{TemplateBinding Background}" Padding="16,24,16,24">
131+
<Grid>
132+
<Grid.RowDefinitions>
133+
<RowDefinition Height="Auto"/>
134+
<RowDefinition />
135+
</Grid.RowDefinitions>
136+
<ToggleButton Grid.Row="0"
136137
HorizontalAlignment="Center"
137138
Foreground="{TemplateBinding Foreground}"
138139
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
139140
Style="{StaticResource MaterialDesignExpanderToggleButton}"
140141
RenderTransformOrigin="0.5,0.5">
141-
<ToggleButton.RenderTransform>
142-
<RotateTransform Angle="90"/>
143-
</ToggleButton.RenderTransform>
144-
</ToggleButton>
145-
<ContentPresenter Grid.Row="1"
142+
<ToggleButton.RenderTransform>
143+
<RotateTransform Angle="90"/>
144+
</ToggleButton.RenderTransform>
145+
</ToggleButton>
146+
<ContentPresenter Grid.Row="1"
146147
HorizontalAlignment="Center"
147-
Margin="16 16 16 0"
148+
Margin="0,16,0,0"
148149
Content="{TemplateBinding Content}" VerticalAlignment="Top" />
149-
</Grid>
150+
</Grid>
151+
</Border>
150152
</ControlTemplate>
151153
</Setter.Value>
152154
</Setter>
@@ -159,24 +161,25 @@
159161
<Setter Property="Template">
160162
<Setter.Value>
161163
<ControlTemplate TargetType="{x:Type ToggleButton}">
162-
<Grid>
163-
<Grid.ColumnDefinitions>
164-
<ColumnDefinition />
165-
<ColumnDefinition Width="Auto"/>
166-
</Grid.ColumnDefinitions>
167-
<ContentPresenter Content="{TemplateBinding Content}"
168-
ContentTemplate="{TemplateBinding ContentTemplate}"
169-
ContentStringFormat="{TemplateBinding ContentStringFormat}"
170-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
164+
<Border Background="{TemplateBinding Background}" Padding="24,16,24,16">
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"
171177
VerticalAlignment="Center"
172-
Margin="16 16 0 16" />
173-
<ToggleButton Grid.Column="1"
174-
Margin="16 0 16 0"
175-
VerticalAlignment="Center"
176-
Foreground="{TemplateBinding Foreground}"
177-
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
178-
Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
179-
</Grid>
178+
Foreground="{TemplateBinding Foreground}"
179+
IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
180+
Style="{StaticResource MaterialDesignExpanderToggleButton}"/>
181+
</Grid>
182+
</Border>
180183
</ControlTemplate>
181184
</Setter.Value>
182185
</Setter>
@@ -189,26 +192,27 @@
189192
<Setter Property="Template">
190193
<Setter.Value>
191194
<ControlTemplate TargetType="{x:Type ToggleButton}">
192-
<Grid>
193-
<Grid.ColumnDefinitions>
194-
<ColumnDefinition />
195-
<ColumnDefinition Width="Auto"/>
196-
</Grid.ColumnDefinitions>
197-
<ContentPresenter VerticalAlignment="Center"
195+
<Border Background="{TemplateBinding Background}" Padding="24,16,24,16">
196+
<Grid>
197+
<Grid.ColumnDefinitions>
198+
<ColumnDefinition />
199+
<ColumnDefinition Width="Auto"/>
200+
</Grid.ColumnDefinitions>
201+
<ContentPresenter VerticalAlignment="Center"
198202
Content="{TemplateBinding Content}"
199-
Margin="16 16 0 16" />
200-
<ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
201-
Margin="16 0 16 0"
203+
Margin="0,0,16,0" />
204+
<ToggleButton IsChecked="{Binding Path=IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
202205
VerticalAlignment="Center"
203206
Foreground="{TemplateBinding Foreground}"
204207
Style="{StaticResource MaterialDesignExpanderToggleButton}"
205208
RenderTransformOrigin="0.5,0.5"
206209
Grid.Column="1">
207-
<ToggleButton.RenderTransform>
208-
<RotateTransform Angle="-180"/>
209-
</ToggleButton.RenderTransform>
210-
</ToggleButton>
211-
</Grid>
210+
<ToggleButton.RenderTransform>
211+
<RotateTransform Angle="-180"/>
212+
</ToggleButton.RenderTransform>
213+
</ToggleButton>
214+
</Grid>
215+
</Border>
212216
</ControlTemplate>
213217
</Setter.Value>
214218
</Setter>

0 commit comments

Comments
 (0)