提交 7a1e9fbf 编写于 作者: M Martin Zikmund

fix: Properly handle FocusManager focus directions

上级 155886f0
......@@ -206,6 +206,13 @@ namespace Windows.UI.Xaml.Input
"Undefined focus navigation direction was used.");
}
if (focusNavigationDirection == FocusNavigationDirection.None)
{
throw new ArgumentOutOfRangeException(
"Focus navigation direction None is not supported in TryMoveFocus",
nameof(focusNavigationDirection));
}
return TryMoveFocusImpl(focusNavigationDirection);
}
......@@ -231,12 +238,10 @@ namespace Windows.UI.Xaml.Input
"Invalid value of focus navigation direction was used.");
}
if (focusNavigationDirection == FocusNavigationDirection.Next ||
focusNavigationDirection == FocusNavigationDirection.Previous ||
focusNavigationDirection == FocusNavigationDirection.None)
if (focusNavigationDirection == FocusNavigationDirection.None)
{
throw new ArgumentOutOfRangeException(
"Focus navigation directions Next, Previous, and None are not supported when using FindNextElementOptions",
"Focus navigation direction None is not supported in TryMoveFocus",
nameof(focusNavigationDirection));
}
......@@ -263,6 +268,13 @@ namespace Windows.UI.Xaml.Input
"Undefined focus navigation direction was used.");
}
if (focusNavigationDirection == FocusNavigationDirection.None)
{
throw new ArgumentOutOfRangeException(
"Focus navigation direction None is not supported in TryMoveFocusAsync",
nameof(focusNavigationDirection));
}
return TryMoveFocusAsyncImpl(focusNavigationDirection);
}
......@@ -282,12 +294,10 @@ namespace Windows.UI.Xaml.Input
"Invalid value of focus navigation direction was used.");
}
if (focusNavigationDirection == FocusNavigationDirection.Next ||
focusNavigationDirection == FocusNavigationDirection.Previous ||
focusNavigationDirection == FocusNavigationDirection.None)
if (focusNavigationDirection == FocusNavigationDirection.None)
{
throw new ArgumentOutOfRangeException(
"Focus navigation directions Next, Previous, and None are not supported when using FindNextElementOptions",
"Focus navigation direction None is not supported in TryMoveFocusAsync",
nameof(focusNavigationDirection));
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册