Browse Source

Merge pull request #4694 from AvaloniaUI/fixes/tabonce-nullablity

Mark TabOnceActiveElement as nullable value.
pull/4700/head
Steven Kirk 6 years ago
committed by GitHub
parent
commit
e9b7b01c91
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      src/Avalonia.Input/KeyboardNavigation.cs

9
src/Avalonia.Input/KeyboardNavigation.cs

@ -25,12 +25,11 @@ namespace Avalonia.Input
/// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property /// attached property set to <see cref="KeyboardNavigationMode.Once"/>, this property
/// defines to which child the focus should move. /// defines to which child the focus should move.
/// </remarks> /// </remarks>
public static readonly AttachedProperty<IInputElement> TabOnceActiveElementProperty = public static readonly AttachedProperty<IInputElement?> TabOnceActiveElementProperty =
AvaloniaProperty.RegisterAttached<InputElement, IInputElement>( AvaloniaProperty.RegisterAttached<InputElement, IInputElement?>(
"TabOnceActiveElement", "TabOnceActiveElement",
typeof(KeyboardNavigation)); typeof(KeyboardNavigation));
/// <summary> /// <summary>
/// Defines the IsTabStop attached property. /// Defines the IsTabStop attached property.
/// </summary> /// </summary>
@ -68,7 +67,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
/// <param name="element">The container.</param> /// <param name="element">The container.</param>
/// <returns>The active element for the container.</returns> /// <returns>The active element for the container.</returns>
public static IInputElement GetTabOnceActiveElement(InputElement element) public static IInputElement? GetTabOnceActiveElement(InputElement element)
{ {
return element.GetValue(TabOnceActiveElementProperty); return element.GetValue(TabOnceActiveElementProperty);
} }
@ -78,7 +77,7 @@ namespace Avalonia.Input
/// </summary> /// </summary>
/// <param name="element">The container.</param> /// <param name="element">The container.</param>
/// <param name="value">The active element for the container.</param> /// <param name="value">The active element for the container.</param>
public static void SetTabOnceActiveElement(InputElement element, IInputElement value) public static void SetTabOnceActiveElement(InputElement element, IInputElement? value)
{ {
element.SetValue(TabOnceActiveElementProperty, value); element.SetValue(TabOnceActiveElementProperty, value);
} }

Loading…
Cancel
Save