|
1 | 1 | <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
2 | 2 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
3 | | - xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"> |
| 3 | + xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf" |
| 4 | + xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"> |
4 | 5 | <ResourceDictionary.MergedDictionaries> |
5 | 6 | <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Font.xaml" /> |
6 | 7 | </ResourceDictionary.MergedDictionaries> |
|
13 | 14 | </Style> |
14 | 15 |
|
15 | 16 | <Style TargetType="{x:Type wpf:DialogHost}"> |
| 17 | + <Style.Resources> |
| 18 | + <converters:FirstNonNullConverter x:Key="FirstNonNullConverter" /> |
| 19 | + </Style.Resources> |
16 | 20 | <Setter Property="DialogMargin" Value="35" /> |
17 | 21 | <Setter Property="DialogTheme" Value="Inherit" /> |
18 | 22 | <Setter Property="FocusVisualStyle" Value="{x:Null}" /> |
|
205 | 209 | IsHitTestVisible="False" |
206 | 210 | Visibility="{Binding ElementName=ContentCoverBorder, Path=Visibility}"> |
207 | 211 | <Grid.OpacityMask> |
208 | | - <VisualBrush Visual="{x:Reference ContentCoverBorder}" /> |
| 212 | + <VisualBrush> |
| 213 | + <VisualBrush.Visual> |
| 214 | + <MultiBinding Converter="{StaticResource FirstNonNullConverter}"> |
| 215 | + <Binding ElementName="ContentCoverBorder" /> |
| 216 | + <Binding Source="{x:Static DependencyProperty.UnsetValue}" /> |
| 217 | + </MultiBinding> |
| 218 | + </VisualBrush.Visual> |
| 219 | + </VisualBrush> |
209 | 220 | </Grid.OpacityMask> |
210 | 221 | <Border x:Name="ContentCoverBorder" |
211 | 222 | Background="{Binding OverlayBackground, RelativeSource={RelativeSource TemplatedParent}}" |
|
236 | 247 | </Style> |
237 | 248 |
|
238 | 249 | <Style x:Key="MaterialDesignEmbeddedDialogHost" TargetType="{x:Type wpf:DialogHost}"> |
| 250 | + <Style.Resources> |
| 251 | + <converters:FirstNonNullConverter x:Key="FirstNonNullConverter" /> |
| 252 | + </Style.Resources> |
239 | 253 | <Setter Property="DialogMargin" Value="35" /> |
240 | 254 | <Setter Property="HorizontalContentAlignment" Value="Center" /> |
241 | 255 | <Setter Property="Placement" Value="Center" /> |
|
380 | 394 | IsHitTestVisible="False" |
381 | 395 | Visibility="{Binding ElementName=ContentCoverBorder, Path=Visibility}"> |
382 | 396 | <Grid.OpacityMask> |
383 | | - <VisualBrush Visual="{x:Reference ContentCoverBorder}" /> |
| 397 | + <VisualBrush> |
| 398 | + <VisualBrush.Visual> |
| 399 | + <MultiBinding Converter="{StaticResource FirstNonNullConverter}"> |
| 400 | + <Binding ElementName="ContentCoverBorder" /> |
| 401 | + <Binding Source="{x:Static DependencyProperty.UnsetValue}" /> |
| 402 | + </MultiBinding> |
| 403 | + </VisualBrush.Visual> |
| 404 | + </VisualBrush> |
384 | 405 | </Grid.OpacityMask> |
385 | 406 | <Border x:Name="ContentCoverBorder" |
386 | 407 | Background="{Binding OverlayBackground, RelativeSource={RelativeSource TemplatedParent}}" |
|
0 commit comments