提交 251d05ee 编写于 作者: M Martin Zikmund

chore: Adjust for iOS

上级 cb428765
......@@ -21,6 +21,7 @@ using Windows.UI.Popups.Internal;
using Windows.UI.Popups;
using Uno.UI.WinRT.Extensions.UI.Popups;
using WinUICoreServices = Uno.UI.Xaml.Core.CoreServices;
using Uno.UI.Xaml.Core;
#if HAS_UNO_WINUI
using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
......@@ -45,7 +46,6 @@ using AppKit;
#else
using View = Windows.UI.Xaml.UIElement;
using ViewGroup = Windows.UI.Xaml.UIElement;
using Uno.UI.Xaml.Core;
#endif
namespace Windows.UI.Xaml
......
......@@ -14,6 +14,7 @@ using Uno.UI.Xaml.Core;
using Uno.UI.Xaml.Input;
using Windows.Foundation;
using Windows.UI.Xaml.Controls;
using WinUICoreServices = Uno.UI.Xaml.Core.CoreServices;
namespace Windows.UI.Xaml.Input
{
......@@ -38,7 +39,7 @@ namespace Windows.UI.Xaml.Input
}
// TODO Uno: This should probably apply to multi-window as well #8341.
private static bool InIslandsMode() => CoreServices.Instance.InitializationType == InitializationType.IslandsOnly;
private static bool InIslandsMode() => WinUICoreServices.Instance.InitializationType == InitializationType.IslandsOnly;
private static object? FindNextFocus(
FocusNavigationDirection focusNavigationDirection,
......
......@@ -13,6 +13,7 @@ using Windows.UI.Xaml.Controls.Primitives;
using Uno.Foundation.Logging;
using Uno.UI.Xaml.Core;
using Windows.UI.Xaml.Media;
using WinUICoreServices = Uno.UI.Xaml.Core.CoreServices;
namespace Windows.UI.Xaml
{
......@@ -106,7 +107,7 @@ namespace Windows.UI.Xaml
get => InternalGetContent();
set
{
if (CoreServices.Instance.InitializationType == InitializationType.IslandsOnly)
if (WinUICoreServices.Instance.InitializationType == InitializationType.IslandsOnly)
{
// Ignore setter, in line with XAML Islands behavior.
return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册