Skip to content

Commit 16ffb02

Browse files
committed
staop datagrid edit popups staying on top when application loses focus. #issue 493 part 2
1 parent a1d57ed commit 16ffb02

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DataGrid.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
4-
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters">
4+
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
5+
xmlns:controlzEx="clr-namespace:ControlzEx">
56

67
<ResourceDictionary.MergedDictionaries>
78
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/materialdesigntheme.checkbox.xaml" />
@@ -70,9 +71,9 @@
7071
<Setter.Value>
7172
<ControlTemplate TargetType="{x:Type TextBox}">
7273
<Grid>
73-
<Popup IsOpen="True" AllowsTransparency="True" Placement="RelativePoint" HorizontalOffset="-6" VerticalOffset="-6"
74-
PlacementTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridCell}}}"
75-
PopupAnimation="Fade">
74+
<controlzEx:PopupEx IsOpen="True" AllowsTransparency="True" Placement="RelativePoint" HorizontalOffset="-6" VerticalOffset="-6"
75+
PlacementTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridCell}}}"
76+
PopupAnimation="Fade">
7677
<Grid>
7778
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
7879
<Border Background="{DynamicResource MaterialDesignPaper}" CornerRadius="2"
@@ -115,7 +116,7 @@
115116
</Grid>
116117
</Border>
117118
</Grid>
118-
</Popup>
119+
</controlzEx:PopupEx>
119120
</Grid>
120121
</ControlTemplate>
121122
</Setter.Value>

0 commit comments

Comments
 (0)