use PopupEx for DialogHost

Author: punker76

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -93,7 +92,6 @@ public DialogHost()
         {
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
-            SizeChanged += (sender, args) => TriggerPopupReposition();            
 
             CommandBindings.Add(new CommandBinding(CloseDialogCommand, CloseDialogHandler));
             CommandBindings.Add(new CommandBinding(OpenDialogCommand, OpenDialogHandler));
@@ -294,45 +292,15 @@ private string SelectState()
             return IsOpen ? OpenStateName : ClosedStateName;
         }
 
-        private void TriggerPopupReposition()
-        {
-            if (_popup == null) return;
-
-            _popup.HorizontalOffset++;
-            _popup.HorizontalOffset--;
-        }
-
         private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs)
         {
             LoadedInstances.Remove(this);
-
-            if (_window != null)
-            {
-                _window.LocationChanged -= WindowOnLocationChanged;
-                _window.SizeChanged -= WindowOnSizeChanged;
-            }
             SetCurrentValue(IsOpenProperty, false);
         }
 
         private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
         {
             LoadedInstances.Add(this);
-
-            _window = Window.GetWindow(this);
-            if (_window == null) return;
-
-            _window.LocationChanged += WindowOnLocationChanged;
-            _window.SizeChanged += WindowOnSizeChanged;
-        }
-
-        private void WindowOnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
-        {
-            TriggerPopupReposition();
-        }
-
-        private void WindowOnLocationChanged(object sender, EventArgs eventArgs)
-        {
-            TriggerPopupReposition();
         }
     }
 }

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -2,7 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:MaterialDesignThemes.Wpf"
-    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
+    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+    xmlns:controlz="clr-namespace:Controlz">
 
 	<ResourceDictionary.MergedDictionaries>
 		<!--	we only bring in the dictionaries for controls which were "invented"
@@ -416,7 +417,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:DialogHost">
-                    <Grid Focusable="False">
+                    <Grid x:Name="DialogHostRoot" Focusable="False">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="PopupStates">
                                 <VisualStateGroup.Transitions>
@@ -528,24 +529,28 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Popup IsOpen="False" StaysOpen="True" AllowsTransparency="True" PopupAnimation="None"
-                               x:Name="PART_Popup"
-                               Placement="Center">
+                        <controlz:PopupEx IsOpen="False"
+                                          PlacementTarget="{Binding ElementName=DialogHostRoot, Mode=OneWay}"
+                                          StaysOpen="True"
+                                          AllowsTransparency="True"
+                                          PopupAnimation="None"
+                                          x:Name="PART_Popup"
+                                          Placement="Center">
                             <Popup.Resources>
                                 <ResourceDictionary>
                                     <ResourceDictionary.MergedDictionaries>
                                         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
                                     </ResourceDictionary.MergedDictionaries>
                                 </ResourceDictionary>
                             </Popup.Resources>
-                            <local:Card Margin="22"                                                                                 
+                            <local:Card Margin="22"
                                         local:ShadowAssist.ShadowDepth="Depth5"
                                         UniformCornerRadius="4"
                                         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
                                         TextElement.FontWeight="Medium"
                                         TextElement.FontSize="14"
-                                        TextOptions.TextFormattingMode="Ideal" 
-                                        TextOptions.TextRenderingMode="Auto"        
+                                        TextOptions.TextFormattingMode="Ideal"
+                                        TextOptions.TextRenderingMode="Auto"
                                         Foreground="{DynamicResource MaterialDesignBody}"
                                         FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
                                         IsTabStop="False"
@@ -555,14 +560,16 @@
                                         Content="{TemplateBinding DialogContent}"
                                         ContentTemplate="{TemplateBinding DialogContentTemplate}"
                                         ContentTemplateSelector="{TemplateBinding DialogContentTemplateSelector}"
-                                        ContentStringFormat="{TemplateBinding DialogContentStringFormat}">
+                                        ContentStringFormat="{TemplateBinding ContentStringFormat}">
                                 <local:Card.RenderTransform>
                                     <TransformGroup>
-                                        <ScaleTransform x:Name="CardScaleTransform" ScaleX="0" ScaleY="0" />
+                                        <ScaleTransform x:Name="CardScaleTransform"
+                                                        ScaleX="0"
+                                                        ScaleY="0" />
                                     </TransformGroup>
                                 </local:Card.RenderTransform>
                             </local:Card>
-                        </Popup>
+                        </controlz:PopupEx>
                         <ContentPresenter 
                                 x:Name="ContentPresenter" Opacity="1"                    
                                 Content="{TemplateBinding ContentControl.Content}" ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}" ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}" />

paket.lock

@@ -2,4 +2,4 @@
 GITHUB
   remote: punker76/Controlz
   specs:
-    src/Controlz/Controlz/PopupEx.cs (60eb353aa53f85bc57f4ff3a46dddcb45838a382)
+    src/Controlz/Controlz/PopupEx.cs (60eb353aa53f85bc57f4ff3a46dddcb45838a382)