holger/ModernWpfPlayground
1
0
Fork 0
mirror of https://github.com/holgerb83/ModernWpfPlayground.git synced 2025-06-30 09:40:52 +02:00
Code Issues 1 Projects 1 Releases Wiki Activity

removed warnings

Browse Source
This commit is contained in:
Holger Börchers
2020-02-18 22:22:07 +01:00
parent ca000aac74
commit d130364643
13 changed files with 29 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PropertyPresenter2/PropertyPresenter2.xaml
View File

@ -1,10 +1,10 @@
<ContentControl
x:Class="LsBricks.Controls.PropertyPresenter2"
x:Class="ModernWpfPlayground.PropertyPresenter2.PropertyPresenter2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:LsBricks.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:propertyPresenter2="clr-namespace:ModernWpfPlayground.PropertyPresenter2"
x:Name="LayoutRoot"
d:DesignHeight="300"
d:DesignWidth="300"
@ -16,13 +16,13 @@
<ContentControl.Resources>
<DataTemplate x:Key="DefaultDataTemplate">
<Grid>
<controls:TextBoxEx
<propertyPresenter2:TextBoxEx
x:Name="InputTextBox"
Text="{Binding Value, ElementName=LayoutRoot}"
Validation.ErrorTemplate="{DynamicResource ValidationErrorTemplate}"
Validation.ValidationAdornerSiteFor="{Binding ElementName=LayoutRoot}">
<TextBox.Style>
<Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type controls:TextBoxEx}">
<Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type propertyPresenter2:TextBoxEx}">
<Setter Property="IsReadOnly" Value="True" />
<Setter Property="UpdateBindingOnEnter" Value="False" />
<Style.Triggers>
@ -38,7 +38,7 @@
</Style.Triggers>
</Style>
</TextBox.Style>
</controls:TextBoxEx>
</propertyPresenter2:TextBoxEx>
<TextBlock
Margin="6,0,0,0"
Padding="2,2,2,2"
@ -86,7 +86,7 @@
</CheckBox.Style>
</CheckBox>
</DataTemplate>
<controls:EnumToKeyValueListConverter x:Key="EnumToKeyValuePairConverter" />
<propertyPresenter2:EnumToKeyValueListConverter x:Key="EnumToKeyValuePairConverter" />
<DataTemplate x:Key="EnumComboBoxDataTemplate">
<ComboBox
DisplayMemberPath="Key"
@ -112,7 +112,7 @@
</ComboBox.Style>
</ComboBox>
</DataTemplate>
<controls:PropertyDataTemplateSelector
<propertyPresenter2:PropertyDataTemplateSelector
x:Key="DataTemplateSelector"
BooleanDataTemplate="{StaticResource BooleanDataTemplate}"
DefaultDataTemplate="{StaticResource DefaultDataTemplate}"
@ -152,7 +152,7 @@
VerticalAlignment="Center"
Focusable="False"
Text="{Binding Label, ElementName=LayoutRoot}" />
<controls:MagicSymbolControl
<propertyPresenter2:MagicSymbolControl
x:Name="PartSymbol"
Grid.Column="2"
Margin="5,0"