-
Notifications
You must be signed in to change notification settings - Fork 531
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for SKXamlCanvas on Uno Platform SkiaSharp backends v2.0 (#…
…1634) (#1704) * fix: [Uno] SKXamlCanvas is now a Canvas * feat: Add support for SKXamlCanvas when running on SkiaSharp based backends This enables SKXamlCanvas for Uno Platform's support for for GTK (Linux, Windows, macOS), WPF and Tizen, for Uno 3.6 and later. * feat: Add Uno Skia samples * bump uno samples to latest uno.ui for VS 16.10 pre3 changes * Update Uno all packages * ci: adjust for wasm net5 * fix: Update WPF sample * Remove unsupported tizen sample * chore: Update to Uno.UI 3.7.6 to fix invalid SkiaSharp.Views dependency * Update llvm to v11.1 Co-authored-by: Jerome Laban <jerome.laban@nventive.com>
- Loading branch information
1 parent
9fbd2ac
commit 80860aa
Showing
56 changed files
with
1,134 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+135 KB
samples/Gallery/Uno/SkiaSharpSample.Gtk/Assets/Fonts/uno-fluentui-assets.ttf
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| using System; | ||
| using GLib; | ||
| using Uno.UI.Runtime.Skia; | ||
|
|
||
| namespace SkiaSharpSample.Gtk | ||
| { | ||
| class Program | ||
| { | ||
| static void Main(string[] args) | ||
| { | ||
| SkiaSharp.Views.UWP.SKSwapChainPanel.RaiseOnUnsupported = false; | ||
|
|
||
| ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs) | ||
| { | ||
| Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString()); | ||
| expArgs.ExitApplication = true; | ||
| }; | ||
|
|
||
| var host = new GtkHost(() => new App(), args); | ||
|
|
||
| host.Run(); | ||
| } | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType> | ||
| <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="exists('..\SkiaSharpSample.UWP')"> | ||
| <EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" /> | ||
| <Content Include="..\SkiaSharpSample.UWP\Assets\StoreLogo.scale-400.png" Link="Assets\StoreLogo.png" /> | ||
| <Content Include="Assets\Fonts\uno-fluentui-assets.ttf" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <UpToDateCheckInput Include="..\SkiaSharpSample.Shared\**\*.xaml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- Note that for WebAssembly version 1.1.1 of the console logger required --> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> | ||
| <PackageReference Include="Uno.UI.Skia.Gtk" Version="3.7.6" /> | ||
| <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.6" Condition="'$(Configuration)'=='Debug'" /> | ||
| </ItemGroup> | ||
| <Import Project="..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" /> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" /> | ||
| <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj" /> | ||
| <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj" /> | ||
| <ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="..\..\..\..\output\native\windows\x64\*.dll" Visible="False" /> | ||
| <Content Include="..\..\..\..\output\native\linux\x64\*.so" Visible="False" /> | ||
| <Content Include="..\..\..\..\output\native\osx\*.dylib" Visible="False" /> | ||
| <Content Include="..\..\Shared\Media\content-font.ttf"> | ||
| <Link>Assets\Media\content-font.ttf</Link> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </Content> | ||
| </ItemGroup> | ||
| <Import Project="..\..\..\..\output\SkiaSharp.Views.Uno\nuget\build\netstandard2.0\SkiaSharp.Views.Uno.targets" Condition="Exists('..\..\..\..\output\SkiaSharp.Views.Uno\nuget\build\netstandard2.0\SkiaSharp.Views.Uno.targets')" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.