From 68a7919f49e311648346a5344b94facbed070ea1 Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Wed, 6 Oct 2021 22:26:42 -0500 Subject: [PATCH] Moved plat-specific windows to UIX.Skia --- UIX.RenderApi.Skia/AssemblyInfo.cs | 3 +- UIX.RenderApi.Skia/UIX.RenderApi.Skia.csproj | 540 +----------------- .../Iris/InputHandlers/TextEditingHandler.cs | 1 + .../Microsoft/Iris}/WpfRenderWindow.WPF.cs | 6 +- .../Microsoft/Iris}/XamlRenderWindow.UWP.cs | 7 +- UIX.Skia/UIX.Skia.csproj | 48 +- Xune.Wpf/MainWindow.xaml.cs | 1 - 7 files changed, 55 insertions(+), 551 deletions(-) rename {UIX.RenderApi.Skia/Microsoft/Iris/Render => UIX.Skia/Microsoft/Iris}/WpfRenderWindow.WPF.cs (98%) rename {UIX.RenderApi.Skia/Microsoft/Iris/Render => UIX.Skia/Microsoft/Iris}/XamlRenderWindow.UWP.cs (98%) diff --git a/UIX.RenderApi.Skia/AssemblyInfo.cs b/UIX.RenderApi.Skia/AssemblyInfo.cs index bfb9a31..f2b7738 100644 --- a/UIX.RenderApi.Skia/AssemblyInfo.cs +++ b/UIX.RenderApi.Skia/AssemblyInfo.cs @@ -17,5 +17,4 @@ using System.Security.Permissions; [assembly: AssemblyVersion("4.8.0.0")] [assembly: SecurityPermission(SecurityAction.RequestMinimum, SkipVerification = true)] -// Allow platform-specific extensions to access internals -[assembly: InternalsVisibleTo("UIX.RenderAPI.Skia.Uno")] +[assembly: InternalsVisibleTo("UIX.Skia")] diff --git a/UIX.RenderApi.Skia/UIX.RenderApi.Skia.csproj b/UIX.RenderApi.Skia/UIX.RenderApi.Skia.csproj index b7a687d..59efea9 100644 --- a/UIX.RenderApi.Skia/UIX.RenderApi.Skia.csproj +++ b/UIX.RenderApi.Skia/UIX.RenderApi.Skia.csproj @@ -1,7 +1,7 @@  - + - netstandard2.0;uap10.0.19041;net5.0-windows + netstandard2.0 {CB2B7609-C7B8-4E2A-82D8-DD631B70B621} Library UIX.RenderApi.Skia @@ -9,543 +9,9 @@ 9 true + - - - - - - - - - - - $(DefineConstants);UWP - - - - - - - - - 6.2.11 - - - - - - $(DefineConstants);WPF - true - - - - - - \ No newline at end of file diff --git a/UIX.Skia/Microsoft/Iris/InputHandlers/TextEditingHandler.cs b/UIX.Skia/Microsoft/Iris/InputHandlers/TextEditingHandler.cs index 8c2dc40..7e1830d 100644 --- a/UIX.Skia/Microsoft/Iris/InputHandlers/TextEditingHandler.cs +++ b/UIX.Skia/Microsoft/Iris/InputHandlers/TextEditingHandler.cs @@ -16,6 +16,7 @@ using Microsoft.Iris.Session; using Microsoft.Iris.UI; using Microsoft.Iris.ViewItems; using System; +using Range = Microsoft.Iris.ModelItems.Range; namespace Microsoft.Iris.InputHandlers { diff --git a/UIX.RenderApi.Skia/Microsoft/Iris/Render/WpfRenderWindow.WPF.cs b/UIX.Skia/Microsoft/Iris/WpfRenderWindow.WPF.cs similarity index 98% rename from UIX.RenderApi.Skia/Microsoft/Iris/Render/WpfRenderWindow.WPF.cs rename to UIX.Skia/Microsoft/Iris/WpfRenderWindow.WPF.cs index 079450f..2b03a43 100644 --- a/UIX.RenderApi.Skia/Microsoft/Iris/Render/WpfRenderWindow.WPF.cs +++ b/UIX.Skia/Microsoft/Iris/WpfRenderWindow.WPF.cs @@ -24,10 +24,10 @@ namespace Microsoft.Iris.Render private IVisualContainer visualRoot; private RenderSession session; - private Window WpfWindow { get; set; } + private System.Windows.Window WpfWindow { get; set; } private WindowInteropHelper InteropHelper { get; set; } - public WpfRenderWindow(Window window) + public WpfRenderWindow(System.Windows.Window window) { WpfWindow = window; InteropHelper = new WindowInteropHelper(window); @@ -283,7 +283,7 @@ namespace Microsoft.Iris.Render } public override HWND AppNotifyWindow { set => appNotifyWindow = value; } - TreeNode Root => throw new NotImplementedException(); + Graphics.TreeNode Root => throw new NotImplementedException(); private bool _IsClosing = false; internal override bool IsClosing => _IsClosing; diff --git a/UIX.RenderApi.Skia/Microsoft/Iris/Render/XamlRenderWindow.UWP.cs b/UIX.Skia/Microsoft/Iris/XamlRenderWindow.UWP.cs similarity index 98% rename from UIX.RenderApi.Skia/Microsoft/Iris/Render/XamlRenderWindow.UWP.cs rename to UIX.Skia/Microsoft/Iris/XamlRenderWindow.UWP.cs index 1a51de1..53c1980 100644 --- a/UIX.RenderApi.Skia/Microsoft/Iris/Render/XamlRenderWindow.UWP.cs +++ b/UIX.Skia/Microsoft/Iris/XamlRenderWindow.UWP.cs @@ -12,6 +12,7 @@ using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; +using XamlWindow = Windows.UI.Xaml.Window; namespace Microsoft.Iris.Render { @@ -19,11 +20,11 @@ namespace Microsoft.Iris.Render { private bool isDragging = false; private GraphicsDevice graphicsDevice; - private Window XamlWindow { get; set; } + private XamlWindow XamlWindow { get; set; } private ApplicationView CurrentView => ApplicationView.GetForCurrentView(); private Rect VisibleBounds => CurrentView.VisibleBounds; - public XamlRenderWindow(Window window) + public XamlRenderWindow(XamlWindow window) { XamlWindow = window; @@ -174,7 +175,7 @@ namespace Microsoft.Iris.Render public override IVisualContainer VisualRoot => throw new NotImplementedException(); - TreeNode Root => throw new NotImplementedException(); + Graphics.TreeNode Root => throw new NotImplementedException(); internal override bool IsClosing => throw new NotImplementedException(); diff --git a/UIX.Skia/UIX.Skia.csproj b/UIX.Skia/UIX.Skia.csproj index 1b62d15..e916ff1 100644 --- a/UIX.Skia/UIX.Skia.csproj +++ b/UIX.Skia/UIX.Skia.csproj @@ -1,7 +1,7 @@  - + - netstandard2.0 + netstandard2.0;uap10.0.19041;net5.0-windows {5681A1BD-B3EC-450B-BF6E-38187204B6BE} Library UIX.Skia @@ -11,8 +11,8 @@ true - - + + @@ -23,7 +23,45 @@ C:\Windows\Microsoft.NET\Framework\v2.0.50727\Accessibility.dll - + + + + + + + + + + + + + + + $(DefineConstants);UWP + + + + + + + + + 6.2.11 + + + + + + $(DefineConstants);WPF + true + + + + diff --git a/Xune.Wpf/MainWindow.xaml.cs b/Xune.Wpf/MainWindow.xaml.cs index cb292ac..6334f65 100644 --- a/Xune.Wpf/MainWindow.xaml.cs +++ b/Xune.Wpf/MainWindow.xaml.cs @@ -1,7 +1,6 @@ using Microsoft.Iris.Render; using SkiaSharp; using SkiaSharp.Views.Desktop; -using System.Reflection; using System.Threading.Tasks; using System.Windows;