Browse Source

Merge pull request #8126 from wieslawsoltes/fixes/FixTimePickerPropertyRegistrations

Fix property owner type registrations
pull/8131/head
Max Katz 4 years ago
committed by GitHub
parent
commit
8a3c662bec
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/Avalonia.Controls/DateTimePickers/TimePicker.cs
  2. 2
      src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

4
src/Avalonia.Controls/DateTimePickers/TimePicker.cs

@ -38,13 +38,13 @@ namespace Avalonia.Controls
/// Defines the <see cref="Header"/> property /// Defines the <see cref="Header"/> property
/// </summary> /// </summary>
public static readonly StyledProperty<object> HeaderProperty = public static readonly StyledProperty<object> HeaderProperty =
AvaloniaProperty.Register<DatePicker, object>(nameof(Header)); AvaloniaProperty.Register<TimePicker, object>(nameof(Header));
/// <summary> /// <summary>
/// Defines the <see cref="HeaderTemplate"/> property /// Defines the <see cref="HeaderTemplate"/> property
/// </summary> /// </summary>
public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty = public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
AvaloniaProperty.Register<DatePicker, IDataTemplate>(nameof(HeaderTemplate)); AvaloniaProperty.Register<TimePicker, IDataTemplate>(nameof(HeaderTemplate));
/// <summary> /// <summary>
/// Defines the <see cref="ClockIdentifier"/> property /// Defines the <see cref="ClockIdentifier"/> property

2
src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@ -118,7 +118,7 @@ namespace Avalonia.Controls.Primitives
/// Defines the <see cref="WrapSelection"/> property. /// Defines the <see cref="WrapSelection"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<bool> WrapSelectionProperty = public static readonly StyledProperty<bool> WrapSelectionProperty =
AvaloniaProperty.Register<ItemsControl, bool>(nameof(WrapSelection), defaultValue: false); AvaloniaProperty.Register<SelectingItemsControl, bool>(nameof(WrapSelection), defaultValue: false);
private static readonly IList Empty = Array.Empty<object>(); private static readonly IList Empty = Array.Empty<object>();
private string _textSearchTerm = string.Empty; private string _textSearchTerm = string.Empty;

Loading…
Cancel
Save