This commit is contained in:
Holger Börchers 2020-04-18 16:24:49 +02:00
parent c44931c11e
commit 05338dd0d2
10 changed files with 24 additions and 24 deletions

View File

@ -6,8 +6,8 @@
xmlns:local="clr-namespace:ModernWpfPlayground" xmlns:local="clr-namespace:ModernWpfPlayground"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/" xmlns:prism="http://prismlibrary.com/"
xmlns:propertyPresenter2="clr-namespace:ModernWpfPlayground.PropertyPresenter2"
xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:propertyPresenter="clr-namespace:ModernWpfPlayground.PropertyPresenter"
x:Name="Window" x:Name="Window"
Title="{Binding Title}" Title="{Binding Title}"
Width="{Binding WindowWidth, Mode=TwoWay}" Width="{Binding WindowWidth, Mode=TwoWay}"
@ -221,23 +221,23 @@
</TabItem> </TabItem>
<TabItem Header="General" IsSelected="True"> <TabItem Header="General" IsSelected="True">
<ui:SimpleStackPanel Margin="5" Spacing="10"> <ui:SimpleStackPanel Margin="5" Spacing="10">
<propertyPresenter2:PropertyPresenter2 Label="Theme Mode" Value="{Binding ThemeMode}" /> <propertyPresenter:PropertyPresenter Label="Theme Mode" Value="{Binding ThemeMode}" />
<propertyPresenter2:PropertyPresenter2 <propertyPresenter:PropertyPresenter
Command="{Binding ShowDialogCommand}" Command="{Binding ShowDialogCommand}"
Label="Hello" Label="Hello"
Symbol="x³" Symbol="x³"
Value="{Binding WelcomeMessage}" /> Value="{Binding WelcomeMessage}" />
<propertyPresenter2:PropertyPresenter2 <propertyPresenter:PropertyPresenter
IsReadOnly="True" IsReadOnly="True"
Label="Hallo" Label="Hallo"
Symbol="x²" Symbol="x²"
Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" /> Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
<propertyPresenter2:PropertyPresenter2 <propertyPresenter:PropertyPresenter
Label="Good bye" Label="Good bye"
Symbol="x²" Symbol="x²"
Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" /> Value="{Binding ValidationTest, UpdateSourceTrigger=PropertyChanged}" />
<propertyPresenter2:PropertyPresenter2 Label="Hello" Value="{Binding BooleanValue}" /> <propertyPresenter:PropertyPresenter Label="Hello" Value="{Binding BooleanValue}" />
<propertyPresenter2:PropertyPresenter2 Label="Hello"> <propertyPresenter:PropertyPresenter Label="Hello">
<Slider <Slider
AutoToolTipPlacement="TopLeft" AutoToolTipPlacement="TopLeft"
Interval="1" Interval="1"
@ -247,13 +247,13 @@
TickFrequency="10" TickFrequency="10"
TickPlacement="BottomRight" TickPlacement="BottomRight"
Value="{Binding SliderTest}" /> Value="{Binding SliderTest}" />
</propertyPresenter2:PropertyPresenter2> </propertyPresenter:PropertyPresenter>
<ui:ProgressRing <ui:ProgressRing
Width="{Binding SliderTest}" Width="{Binding SliderTest}"
Height="{Binding SliderTest}" Height="{Binding SliderTest}"
IsActive="{Binding BooleanValue}" IsActive="{Binding BooleanValue}"
Visibility="{Binding VisibilityEnumTest}" /> Visibility="{Binding VisibilityEnumTest}" />
<propertyPresenter2:PropertyPresenter2 Label="Visi" Value="{Binding VisibilityEnumTest}" /> <propertyPresenter:PropertyPresenter Label="Visi" Value="{Binding VisibilityEnumTest}" />
<TextBox Text="Dummy" /> <TextBox Text="Dummy" />
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
</TabItem> </TabItem>

View File

@ -1,5 +1,5 @@
<ContentControl <ContentControl
x:Class="ModernWpfPlayground.PropertyPresenter2.PropertyPresenter2" x:Class="ModernWpfPlayground.PropertyPresenter.PropertyPresenter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

View File

@ -3,72 +3,72 @@ using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Markup; using System.Windows.Markup;
namespace ModernWpfPlayground.PropertyPresenter2 namespace ModernWpfPlayground.PropertyPresenter
{ {
/// <inheritdoc cref="ContentControl" /> /// <inheritdoc cref="ContentControl" />
/// <summary> /// <summary>
/// Interaction logic for PropertyPresenter.xaml /// Interaction logic for PropertyPresenter.xaml
/// </summary> /// </summary>
[ContentProperty(nameof(Value))] [ContentProperty(nameof(Value))]
public sealed partial class PropertyPresenter2 public sealed partial class PropertyPresenter
{ {
/// <summary> /// <summary>
/// Button alignment property. /// Button alignment property.
/// </summary> /// </summary>
public static readonly DependencyProperty ButtonAlignmentProperty = DependencyProperty.Register(nameof(ButtonAlignment), typeof(Dock), typeof(PropertyPresenter2), new PropertyMetadata(Dock.Right)); public static readonly DependencyProperty ButtonAlignmentProperty = DependencyProperty.Register(nameof(ButtonAlignment), typeof(Dock), typeof(PropertyPresenter), new PropertyMetadata(Dock.Right));
/// <summary> /// <summary>
/// Content of the command property. /// Content of the command property.
/// </summary> /// </summary>
public static readonly DependencyProperty CommandContentProperty = DependencyProperty.Register(nameof(CommandContent), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata("...")); public static readonly DependencyProperty CommandContentProperty = DependencyProperty.Register(nameof(CommandContent), typeof(object), typeof(PropertyPresenter), new PropertyMetadata("..."));
/// <summary> /// <summary>
/// Command Parameter property /// Command Parameter property
/// </summary> /// </summary>
public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata(default(object))); public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(PropertyPresenter), new PropertyMetadata(default(object)));
/// <summary> /// <summary>
/// Command property /// Command property
/// </summary> /// </summary>
public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(PropertyPresenter2), new PropertyMetadata(default(ICommand))); public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(PropertyPresenter), new PropertyMetadata(default(ICommand)));
/// <summary> /// <summary>
/// is checked property. /// is checked property.
/// </summary> /// </summary>
public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool?), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(bool?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool?), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(bool?), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
/// <summary> /// <summary>
/// Is readonly property /// Is readonly property
/// </summary> /// </summary>
public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(PropertyPresenter2), new PropertyMetadata(default(bool))); public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(PropertyPresenter), new PropertyMetadata(default(bool)));
/// <summary> /// <summary>
/// Label property /// Label property
/// </summary> /// </summary>
public static readonly DependencyProperty LabelProperty = DependencyProperty.Register(nameof(Label), typeof(string), typeof(PropertyPresenter2), new PropertyMetadata(default(string))); public static readonly DependencyProperty LabelProperty = DependencyProperty.Register(nameof(Label), typeof(string), typeof(PropertyPresenter), new PropertyMetadata(default(string)));
/// <summary> /// <summary>
/// label width property. /// label width property.
/// </summary> /// </summary>
public static readonly DependencyProperty LabelWidthProperty = DependencyProperty.Register(nameof(LabelWidth), typeof(double), typeof(PropertyPresenter2), new PropertyMetadata(150.0)); public static readonly DependencyProperty LabelWidthProperty = DependencyProperty.Register(nameof(LabelWidth), typeof(double), typeof(PropertyPresenter), new PropertyMetadata(150.0));
/// <summary> /// <summary>
/// Symbol Property /// Symbol Property
/// </summary> /// </summary>
public static readonly DependencyProperty SymbolProperty = DependencyProperty.Register(nameof(Symbol), typeof(object), typeof(PropertyPresenter2), new PropertyMetadata(default(object))); public static readonly DependencyProperty SymbolProperty = DependencyProperty.Register(nameof(Symbol), typeof(object), typeof(PropertyPresenter), new PropertyMetadata(default(object)));
/// <summary> /// <summary>
/// Value Property /// Value Property
/// </summary> /// </summary>
public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(nameof(Value), typeof(object), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(nameof(Value), typeof(object), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
/// <summary> /// <summary>
/// Watermark Property /// Watermark Property
/// </summary> /// </summary>
public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(nameof(Watermark), typeof(string), typeof(PropertyPresenter2), new FrameworkPropertyMetadata(default(string))); public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(nameof(Watermark), typeof(string), typeof(PropertyPresenter), new FrameworkPropertyMetadata(default(string)));
/// <inheritdoc /> /// <inheritdoc />
public PropertyPresenter2() public PropertyPresenter()
{ {
InitializeComponent(); InitializeComponent();
} }