Skip to content

Commit 549e9f3

Browse files
committed
remove CustomValidationPopup and use PopupEx
1 parent 6afcd3c commit 549e9f3

File tree

3 files changed

+8
-88
lines changed

3 files changed

+8
-88
lines changed

MaterialDesignThemes.Wpf/CustomValidationPopup.cs

Lines changed: 0 additions & 81 deletions
This file was deleted.

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
<Compile Include="Converters\ShadowConverter.cs" />
223223
<Compile Include="Converters\SizeToRectConverter.cs" />
224224
<Compile Include="CustomPopupPlacementCallbackHelper.cs" />
225-
<Compile Include="CustomValidationPopup.cs" />
226225
<Compile Include="DataGridAssist.cs" />
227226
<Compile Include="DateTimeEx.cs" />
228227
<Compile Include="DialogClosingEventArgs.cs" />

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ValidationErrorTemplate.xaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
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:controlz="clr-namespace:Controlz">
45
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
56

67
<ControlTemplate x:Key="MaterialDesignValidationErrorTemplate">
@@ -23,14 +24,15 @@
2324
<ContentPresenter Content="{Binding CurrentItem}" />
2425
</Border>
2526

26-
<wpf:CustomValidationPopup x:Name="ValidationPopup"
27-
IsOpen="False"
28-
Placement="Bottom" PlacementTarget="{Binding ElementName=Placeholder}"
29-
AllowsTransparency="True">
27+
<controlz:PopupEx x:Name="ValidationPopup"
28+
IsOpen="False"
29+
Placement="Bottom"
30+
PlacementTarget="{Binding ElementName=Placeholder, Mode=OneWay}"
31+
AllowsTransparency="True">
3032
<Border Background="{DynamicResource MaterialDesignPaper}">
3133
<ContentPresenter Content="{Binding CurrentItem}" />
3234
</Border>
33-
</wpf:CustomValidationPopup>
35+
</controlz:PopupEx>
3436
</StackPanel>
3537
<ControlTemplate.Triggers>
3638
<MultiDataTrigger>

0 commit comments

Comments
 (0)