[WIP] feat: App-specific ApplicationData on Skia

src/SamplesApp/SamplesApp.Shared/App.xaml.cs

@@ -83,6 +83,10 @@ public App()
 			Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
 			Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-US");
 
+#if __SKIA__
+			ApplicationView.PreferredLaunchViewSize = new Windows.Foundation.Size(1024, 768);
+#endif
+
 			ConfigureFeatureFlags();
 
 			AssertIssue1790ApplicationSettingsUsable();

src/SamplesApp/SamplesApp.Skia.WPF/App.xaml

@@ -1,8 +1,7 @@
 <Application x:Class="SamplesApp.WPF.App"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:local="clr-namespace:SamplesApp.WPF"
-			 StartupUri="MainWindow.xaml">
+			 xmlns:local="clr-namespace:SamplesApp.WPF">
 	<Application.Resources>
 
 	</Application.Resources>

src/SamplesApp/SamplesApp.Skia.WPF/App.xaml.cs

@@ -1,21 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using Uno.UI.Skia;
 
 namespace SamplesApp.WPF
 {
 	/// <summary>
 	/// Interaction logic for App.xaml
 	/// </summary>
-	public partial class App : Application
+	public partial class App : System.Windows.Application
 	{
 		public App()
 		{
 			SamplesApp.App.ConfigureFilters();
+
+			var host = new WpfHost(Dispatcher, () => new SamplesApp.App());
+
+			host.Run();
 		}
 	}
 }

src/SamplesApp/SamplesApp.UWP/Package.appxmanifest

@@ -9,15 +9,15 @@
   IgnorableNamespaces="uap mp rescap uap2">
 
   <Identity
-    Name="6c25beb3-e332-48d3-b4de-20a0b71935cd"
-    Publisher="CN=Uno"
+    Name="SamplesApp"
+    Publisher="CN=Uno Platform"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="1897f84c-689e-44d3-a8b7-c521a62818ae" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>SamplesApp</DisplayName>
-    <PublisherDisplayName>SamplesApp</PublisherDisplayName>
+    <PublisherDisplayName>Uno Platform</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 

src/Uno.UI.Composition/Composition/Compositor.skia.cs

@@ -1,9 +1,10 @@
 #nullable enable
 
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using SkiaSharp;
+using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 
 namespace Windows.UI.Composition
@@ -41,9 +42,8 @@ public void Dispose()
 			}
 		}
 
-		internal ContainerVisual? RootVisual { get; set; }
-
 		internal float CurrentOpacity => _currentOpacity;
+
 		internal SKColorFilter? CurrentOpacityColorFilter
 		{
 			get
@@ -65,17 +65,19 @@ internal SKColorFilter? CurrentOpacityColorFilter
 			}
 		}
 
-		internal void Render(SKSurface surface)
+		internal void RenderRootVisual(SKSurface surface, ContainerVisual rootVisual)
 		{
+			if (rootVisual is null)
+			{
+				throw new ArgumentNullException(nameof(rootVisual));
+			}
+
 			_isDirty = false;
 
-			if (RootVisual != null)
+			var children = rootVisual.GetChildrenInRenderOrder();
+			for (var i = 0; i < children.Count; i++)
 			{
-				var children = RootVisual.GetChildrenInRenderOrder();
-				for (var i = 0; i < children.Count; i++)
-				{
-					RenderVisual(surface, children[i]);
-				}
+				RenderVisual(surface, children[i]);
 			}
 		}
 
@@ -167,7 +169,7 @@ partial void InvalidateRenderPartial()
 			if (!_isDirty)
 			{
 				_isDirty = true;
-				CoreWindow.QueueInvalidateRender();
+				CoreApplication.QueueInvalidateRender();
 			}
 		}
 	}

src/Uno.UI.Runtime.Skia.Gtk/ApplicationModel/DataTransfer/ClipboardExtensions.cs

@@ -29,7 +29,7 @@ internal class ClipboardExtensions : IClipboardExtension
 
 		public ClipboardExtensions(object owner)
 		{
-			_clipboard = Clipboard.GetDefault(GtkHost.Window.Display);
+			_clipboard = Clipboard.GetDefault(GtkHost.Current!.MainWindow.Display);
 		}
 
 		public void Clear() => _clipboard.Clear();

src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkApplicationViewExtension.cs

@@ -0,0 +1,33 @@
+#nullable enable
+using Windows.Foundation;
+using Windows.UI.ViewManagement;
+
+namespace Uno.UI.Runtime.Skia
+{
+	internal class GtkApplicationViewExtension : IApplicationViewExtension
+	{
+		private readonly ApplicationView _owner;
+
+		public GtkApplicationViewExtension(object owner)
+		{
+			_owner = (ApplicationView)owner;
+		}
+
+		public void ExitFullScreenMode()
+		{
+			GtkHost.Current!.MainWindow!.Unfullscreen();
+		}
+
+		public bool TryEnterFullScreenMode()
+		{
+			GtkHost.Current!.MainWindow!.Fullscreen();
+			return true;
+		}
+
+		public bool TryResizeView(Size size)
+		{
+			GtkHost.Current!.MainWindow!.Resize((int)size.Width, (int)size.Height);
+			return true;
+		}
+	}
+}

src/Uno.UI.Runtime.Skia.Gtk/GtkCoreWindowExtension.Keyboard.cs → src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkCoreWindowExtension.Keyboard.cs

@@ -1,24 +1,10 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Gdk;
 using Gtk;
-using Uno.Extensions;
-using Uno.Foundation.Extensibility;
-using Uno.UI.Runtime.Skia;
-using Uno.UI.Runtime.Skia.GTK.Extensions;
-using Windows.ApplicationModel;
-using Windows.Devices.Input;
-using Windows.Foundation;
 using Windows.System;
-using Windows.UI.Composition;
 using Windows.UI.Core;
-using Windows.UI.Input;
 using Uno.Foundation.Logging;
 
 namespace Uno.UI.Runtime.Skia

src/Uno.UI.Runtime.Skia.Gtk/GtkCoreWindowExtension.cs → src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkCoreWindowExtension.cs

@@ -1,28 +1,14 @@
 #nullable enable
 //#define TRACE_NATIVE_POINTER_EVENTS
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using Gdk;
 using Gtk;
-using Uno.Extensions;
-using Uno.UI.Runtime.Skia.GTK.Extensions;
-using Windows.Devices.Input;
-using Windows.System;
 using Windows.UI.Core;
-using Windows.UI.Input;
 using Uno.Foundation.Logging;
-using static Windows.UI.Input.PointerUpdateKind;
-using Device = Gtk.Device;
-using Exception = System.Exception;
 using Windows.UI.Xaml;
-using Uno.UI.Xaml.Core;
-using Windows.Foundation;
-using Uno.UI.XamlHost.Skia.Gtk.Hosting;
-using Atk;
+using Uno.UI.Hosting;
+using Uno.UI.Runtime.Skia.GTK.Hosting;
+using Uno.UI.Runtime.Skia.GTK;
 
 namespace Uno.UI.Runtime.Skia
 {
@@ -39,14 +25,8 @@ public GtkCoreWindowExtension(object owner)
 
 		partial void InitializeKeyboard();
 
-		internal static Fixed? FindNativeOverlayLayer(Gtk.Window window)
-		{
-			var overlay = (Overlay)((EventBox)window.Child).Child;
-			return overlay.Children.OfType<Fixed>().FirstOrDefault();
-		}
-
 		internal static Fixed? GetOverlayLayer(XamlRoot xamlRoot) =>
-			XamlRootMap.GetHostForRoot(xamlRoot)?.NativeOverlayLayer;
+			GtkManager.XamlRootMap.GetHostForRoot(xamlRoot)?.NativeOverlayLayer;
 
 		public bool IsNativeElement(object content)
 			=> content is Widget;

src/Uno.UI.Runtime.Skia.Gtk/GtkDisplayInformationExtension.cs → src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkDisplayInformationExtension.cs

@@ -10,27 +10,32 @@ namespace Uno.UI.Runtime.Skia;
 internal class GtkDisplayInformationExtension : IDisplayInformationExtension
 {
 	private readonly DisplayInformation _displayInformation;
-	private readonly Window _window;
 	private readonly DpiHelper _dpiHelper;
 
 	private float? _dpi;
 
-	public GtkDisplayInformationExtension(object owner, Gtk.Window window)
+	public GtkDisplayInformationExtension(object owner)
 	{
 		_displayInformation = (DisplayInformation)owner;
-		_window = window;
-		_dpiHelper = new DpiHelper(_window);
+		GtkHost.Current!.MainWindowShown += GtkDisplayInformationExtension_MainWindowShown;
+		_dpiHelper = new DpiHelper();
+	}
+
+	private void GtkDisplayInformationExtension_MainWindowShown(object? sender, EventArgs e)
+	{
 		_dpiHelper.DpiChanged += OnDpiChanged;
 	}
 
+	private Gtk.Window GetWindow() => GtkHost.Current!.MainWindow!;
+
 	public DisplayOrientations CurrentOrientation => DisplayOrientations.Landscape;
 
-	public uint ScreenHeightInRawPixels => (uint)_window.Display.GetMonitorAtWindow(_window.Window).Workarea.Height;
+	public uint ScreenHeightInRawPixels => (uint)GetWindow().Display.GetMonitorAtWindow(GetWindow().Window).Workarea.Height;
 
-	public uint ScreenWidthInRawPixels => (uint)_window.Display.GetMonitorAtWindow(_window.Window).Workarea.Width;
+	public uint ScreenWidthInRawPixels => (uint)GetWindow().Display.GetMonitorAtWindow(GetWindow().Window).Workarea.Width;
 
 	public float LogicalDpi
-		=> _dpi ??= _window.Display.GetMonitorAtWindow(_window.Window).ScaleFactor * DisplayInformation.BaseDpi;
+		=> _dpi ??= GetWindow().Display.GetMonitorAtWindow(GetWindow().Window).ScaleFactor * DisplayInformation.BaseDpi;
 
 	public double RawPixelsPerViewPixel => LogicalDpi / DisplayInformation.BaseDpi;
 
@@ -40,7 +45,7 @@ public float LogicalDpi
 
 	private void OnDpiChanged(object? sender, EventArgs args)
 	{
-		_dpi = _window.Display.GetMonitorAtWindow(_window.Window).ScaleFactor * DisplayInformation.BaseDpi;
+		_dpi = GetWindow().Display.GetMonitorAtWindow(GetWindow().Window).ScaleFactor * DisplayInformation.BaseDpi;
 		_displayInformation.NotifyDpiChanged();
 	}
 }

src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkExtensionsRegistrar.cs

@@ -0,0 +1,47 @@
+using Uno.ApplicationModel.DataTransfer;
+using Uno.Extensions.ApplicationModel.Core;
+using Uno.Extensions.Storage.Pickers;
+using Uno.Extensions.System;
+using Uno.Extensions.UI.Core.Preview;
+using Uno.Foundation.Extensibility;
+using Uno.Helpers.Theming;
+using Uno.UI.Core.Preview;
+using Uno.UI.Runtime.Skia.GTK.Extensions.ApplicationModel.DataTransfer;
+using Uno.UI.Runtime.Skia.GTK.Extensions.Helpers.Theming;
+using Uno.UI.Runtime.Skia.GTK.Extensions.System;
+using Uno.UI.Runtime.Skia.GTK.Extensions.UI.Xaml.Controls;
+using Uno.UI.Runtime.Skia.GTK.System.Profile;
+using Uno.UI.Xaml.Controls.Extensions;
+using Windows.Storage.Pickers;
+using Windows.System.Profile.Internal;
+using Windows.UI.Xaml.Controls;
+#pragma warning disable CS0649
+namespace Uno.UI.Runtime.Skia.GTK.Extensions;
+
+internal static class GtkExtensionsRegistrar
+{
+	private static bool _registered;
+
+	internal static void Register()
+	{
+		if (_registered)
+		{
+			return;
+		}
+
+		ApiExtensibility.Register(typeof(Uno.ApplicationModel.Core.ICoreApplicationExtension), o => new CoreApplicationExtension(o));
+		ApiExtensibility.Register(typeof(Windows.UI.Core.IUnoCorePointerInputSource), o => new GtkCorePointerInputSource());
+		ApiExtensibility.Register(typeof(Windows.UI.Core.ICoreWindowExtension), o => new GtkCoreWindowExtension(o));
+		ApiExtensibility.Register(typeof(Windows.UI.ViewManagement.IApplicationViewExtension), o => new GtkApplicationViewExtension(o));
+		ApiExtensibility.Register(typeof(ISystemThemeHelperExtension), o => new GtkSystemThemeHelperExtension(o));
+		ApiExtensibility.Register(typeof(Windows.Graphics.Display.IDisplayInformationExtension), o => new GtkDisplayInformationExtension(o));
+		ApiExtensibility.Register<TextBoxView>(typeof(IOverlayTextBoxViewExtension), o => new TextBoxViewExtension(o));
+		ApiExtensibility.Register(typeof(ILauncherExtension), o => new LauncherExtension(o));
+		ApiExtensibility.Register<FileOpenPicker>(typeof(IFileOpenPickerExtension), o => new FileOpenPickerExtension(o));
+		ApiExtensibility.Register<FolderPicker>(typeof(IFolderPickerExtension), o => new FolderPickerExtension(o));
+		ApiExtensibility.Register(typeof(IClipboardExtension), o => new ClipboardExtensions(o));
+		ApiExtensibility.Register<FileSavePicker>(typeof(IFileSavePickerExtension), o => new FileSavePickerExtension(o));
+		ApiExtensibility.Register(typeof(IAnalyticsInfoExtension), o => new AnalyticsInfoExtension());
+		ApiExtensibility.Register(typeof(ISystemNavigationManagerPreviewExtension), o => new SystemNavigationManagerPreviewExtension());
+	}
+}

src/Uno.UI.Runtime.Skia.Gtk/Extensions/Storage/Pickers/FileOpenPickerExtension.cs

@@ -43,7 +43,7 @@ private async Task<StorageFile[]> OpenPickerAsync(bool multiple)
 
 			using FileChooserDialog dialog = new FileChooserDialog(
 				"Open",
-				GtkHost.Window,
+				GtkHost.Current!.MainWindow,
 				FileChooserAction.Open,
 				"Cancel", ResponseType.Cancel,
 				commitText, ResponseType.Accept);