Skip to content

Commit 1e856d0

Browse files
Lift ContentControl from child of Ripple, to sibling of Ripple (#3843)
1 parent 806146b commit 1e856d0

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -272,17 +272,18 @@
272272
Clip="{Binding ElementName=GeometryEllipse, Path=RenderedGeometry}"
273273
ClipToBounds="True"
274274
Focusable="False"
275-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
276-
<!-- additional layer so we don't rotate the ripple directly which can cause jumpyness under certain layouts -->
277-
<ContentControl Content="{TemplateBinding Content}"
278-
ContentTemplate="{TemplateBinding ContentTemplate}"
279-
Focusable="False"
280-
RenderTransformOrigin=".5,.5">
281-
<ContentControl.RenderTransform>
282-
<RotateTransform x:Name="ContentRotateTransform" Angle="0" />
283-
</ContentControl.RenderTransform>
284-
</ContentControl>
285-
</wpf:Ripple>
275+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
276+
<!-- additional layer so we don't rotate the ripple directly which can cause jumpyness under certain layouts -->
277+
<ContentControl Content="{TemplateBinding Content}"
278+
ContentTemplate="{TemplateBinding ContentTemplate}"
279+
Focusable="False"
280+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
281+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
282+
RenderTransformOrigin=".5,.5">
283+
<ContentControl.RenderTransform>
284+
<RotateTransform x:Name="ContentRotateTransform" Angle="0" />
285+
</ContentControl.RenderTransform>
286+
</ContentControl>
286287
<Ellipse x:Name="GeometryEllipse"
287288
Fill="Transparent"
288289
Focusable="False"

0 commit comments

Comments
 (0)