Skip to content

Commit beabd6c

Browse files
committed
Applying fix for binding error
Fixes #3834
1 parent fad77d5 commit beabd6c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<Setter Property="Template">
2323
<Setter.Value>
2424
<ControlTemplate TargetType="wpf:DialogHost">
25+
<ControlTemplate.Resources>
26+
<converters:FirstNonNullConverter x:Key="FirstNonNullConverter" />
27+
</ControlTemplate.Resources>
2528
<Grid x:Name="DialogHostRoot" Focusable="False">
2629
<VisualStateManager.VisualStateGroups>
2730
<VisualStateGroup x:Name="PopupStates">
@@ -217,7 +220,7 @@
217220
<Grid.OpacityMask>
218221
<VisualBrush>
219222
<VisualBrush.Visual>
220-
<MultiBinding Converter="{x:Static converters:FirstNonNullConverter.Instance}">
223+
<MultiBinding Converter="{StaticResource FirstNonNullConverter}">
221224
<Binding ElementName="ContentCoverBorder" />
222225
<Binding Source="{x:Static DependencyProperty.UnsetValue}" />
223226
</MultiBinding>
@@ -259,6 +262,9 @@
259262
<Setter Property="Template">
260263
<Setter.Value>
261264
<ControlTemplate TargetType="wpf:DialogHost">
265+
<ControlTemplate.Resources>
266+
<converters:FirstNonNullConverter x:Key="FirstNonNullConverter" />
267+
</ControlTemplate.Resources>
262268
<Grid x:Name="DialogHostRoot" Focusable="False">
263269
<VisualStateManager.VisualStateGroups>
264270
<VisualStateGroup x:Name="PopupStates">
@@ -407,7 +413,7 @@
407413
<Grid.OpacityMask>
408414
<VisualBrush>
409415
<VisualBrush.Visual>
410-
<MultiBinding Converter="{x:Static converters:FirstNonNullConverter.Instance}">
416+
<MultiBinding Converter="{StaticResource FirstNonNullConverter}">
411417
<Binding ElementName="ContentCoverBorder" />
412418
<Binding Source="{x:Static DependencyProperty.UnsetValue}" />
413419
</MultiBinding>

0 commit comments

Comments
 (0)