From 8098243abc376e57eb392a3da342503f611cd7e8 Mon Sep 17 00:00:00 2001
From: Nicolai Henriksen <nicolai.h80@gmail.com>
Date: Fri, 2 May 2025 20:23:26 +0200
Subject: [PATCH] Lift ContentControl from child of Ripple, to sibling of
 Ripple

---
 .../Themes/MaterialDesignTheme.PopupBox.xaml  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
index f7d21bd418..5a5fe19a52 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
@@ -272,17 +272,18 @@
                                   Clip="{Binding ElementName=GeometryEllipse, Path=RenderedGeometry}"
                                   ClipToBounds="True"
                                   Focusable="False"
-                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <!-- additional layer so we don't rotate the ripple directly which can cause jumpyness under certain layouts -->
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Focusable="False"
-                                        RenderTransformOrigin=".5,.5">
-                          <ContentControl.RenderTransform>
-                            <RotateTransform x:Name="ContentRotateTransform" Angle="0" />
-                          </ContentControl.RenderTransform>
-                        </ContentControl>
-                      </wpf:Ripple>
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                      <!-- additional layer so we don't rotate the ripple directly which can cause jumpyness under certain layouts -->
+                      <ContentControl Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      Focusable="False"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      RenderTransformOrigin=".5,.5">
+                        <ContentControl.RenderTransform>
+                          <RotateTransform x:Name="ContentRotateTransform" Angle="0" />
+                        </ContentControl.RenderTransform>
+                      </ContentControl>
                       <Ellipse x:Name="GeometryEllipse"
                                Fill="Transparent"
                                Focusable="False"