Merge pull request #704 from Keboo/fix703

Update popup box popup when the anchor control moves.

Author: ButchersBoy

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -1,18 +1,15 @@
-using System;
+using ControlzEx;
+using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using ControlzEx;
 
 namespace MaterialDesignThemes.Wpf
 {
@@ -110,13 +107,19 @@ public class PopupBox : ContentControl
         private ContentControl _popupContentControl;
         private ToggleButton _toggleButton;
         private Point _popupPointFromLastRequest;
+        private Point _lastRelativePositon;
 
         static PopupBox()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(PopupBox), new FrameworkPropertyMetadata(typeof(PopupBox)));
             ToolTipService.IsEnabledProperty.OverrideMetadata(typeof(PopupBox), new FrameworkPropertyMetadata(null, CoerceToolTipIsEnabled));
             EventManager.RegisterClassHandler(typeof(PopupBox), Mouse.LostMouseCaptureEvent, new MouseEventHandler(OnLostMouseCapture));
-            EventManager.RegisterClassHandler(typeof(PopupBox), Mouse.MouseDownEvent, new MouseButtonEventHandler(OnMouseButtonDown), true);            
+            EventManager.RegisterClassHandler(typeof(PopupBox), Mouse.MouseDownEvent, new MouseButtonEventHandler(OnMouseButtonDown), true);
+        }
+
+        public PopupBox()
+        {
+            LayoutUpdated += OnLayoutUpdated;
         }
 
         public static readonly DependencyProperty ToggleContentProperty = DependencyProperty.Register(
@@ -229,8 +232,8 @@ private static void IsPopupOpenPropertyChangedCallback(DependencyObject dependen
                 else
                     Mouse.Capture(null);
             }
-                        
-            popupBox.AnimateChildrenIn(!newValue);                 
+
+            popupBox.AnimateChildrenIn(!newValue);
             popupBox._popup?.RefreshPosition();
 
             VisualStateManager.GoToState(popupBox, newValue ? PopupIsOpenStateName : PopupIsClosedStateName, true);
@@ -239,7 +242,6 @@ private static void IsPopupOpenPropertyChangedCallback(DependencyObject dependen
                 popupBox.OnOpened();
             else
                 popupBox.OnClosed();
-
         }
 
         /// <summary>
@@ -398,7 +400,7 @@ public override void OnApplyTemplate()
             if (_popup != null)
                 _popup.Loaded += PopupOnLoaded;
             if (_toggleButton != null)
-                _toggleButton.PreviewMouseLeftButtonUp += ToggleButtonOnPreviewMouseLeftButtonUp;                                
+                _toggleButton.PreviewMouseLeftButtonUp += ToggleButtonOnPreviewMouseLeftButtonUp;
 
             VisualStateManager.GoToState(this, IsPopupOpen ? PopupIsOpenStateName : PopupIsClosedStateName, false);
         }
@@ -408,7 +410,7 @@ protected override void OnIsKeyboardFocusWithinChanged(DependencyPropertyChanged
             base.OnIsKeyboardFocusWithinChanged(e);
 
             if (IsPopupOpen && !IsKeyboardFocusWithin)
-            {                
+            {
                 Close();
             }
         }
@@ -439,9 +441,22 @@ protected override void OnMouseEnter(MouseEventArgs e)
 
                 SetCurrentValue(IsPopupOpenProperty, true);
             }
-
             base.OnMouseEnter(e);
         }
+
+        private void OnLayoutUpdated(object sender, EventArgs eventArgs)
+        {
+            if (_popupContentControl != null && _popup != null &&
+                (PopupMode == PopupBoxPopupMode.MouseOver || PopupMode == PopupBoxPopupMode.MouseOverEager))
+            {
+                Point relativePosition = _popupContentControl.TranslatePoint(new Point(), this);
+                if (relativePosition != _lastRelativePositon)
+                {
+                    _popup.RefreshPosition();
+                    _lastRelativePositon = _popupContentControl.TranslatePoint(new Point(), this);
+                }
+            }
+        }
 
         protected override void OnMouseLeave(MouseEventArgs e)
         {
@@ -461,16 +476,16 @@ protected void Close()
 
         private CustomPopupPlacement[] GetPopupPlacement(Size popupSize, Size targetSize, Point offset)
         {
-            double x, y;			
-			
+            double x, y;
+
             if (FlowDirection == FlowDirection.RightToLeft)
                 offset.X += targetSize.Width / 2;
-			
+
             switch (PlacementMode)
             {
                 case PopupBoxPlacementMode.BottomAndAlignLeftEdges:
                     x = 0 - Math.Abs(offset.X*3);
-                    y = targetSize.Height - Math.Abs(offset.Y);                    
+                    y = targetSize.Height - Math.Abs(offset.Y);
                     break;
                 case PopupBoxPlacementMode.BottomAndAlignRightEdges:
                     x = 0 - popupSize.Width + targetSize.Width - offset.X;
@@ -699,7 +714,7 @@ private static void OnMouseButtonDown(object sender, MouseButtonEventArgs e)
         }
 
         protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {            
+        {
             if (IsPopupOpen && !StaysOpen)
             {
                 Close();
@@ -735,7 +750,7 @@ private void ToggleButtonOnPreviewMouseLeftButtonUp(object sender, MouseButtonEv
 
             Close();
             Mouse.Capture(null);
-            mouseButtonEventArgs.Handled = true;            
+            mouseButtonEventArgs.Handled = true;
         }
 
         private static object CoerceToolTipIsEnabled(DependencyObject dependencyObject, object value)