zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #233 from irihitech/wasm

Browse Source 
support WASM
This commit is contained in:
Dong Bin 2023-07-21 01:01:04 +08:00 committed by GitHub
commit 694a9b4c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demo/Semi.Avalonia.Demo.Web/App.axaml
View File

@ -1,10 +1,10 @@
<Application <Application
x:Class="Semi.Avalonia.Demo.Web.App" x:Class="Semi.Avalonia.Demo.Web.App"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:local="using:Semi.Avalonia.Demo.Web">
<Application.Styles> <Application.Styles>
<FluentTheme /> <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
<StyleInclude Source="avares://Semi.Avalonia/Themes/LightTheme.axaml" /> <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
</Application.Styles> </Application.Styles>
</Application> </Application>

9
demo/Semi.Avalonia.Demo.Web/AppBundle/app.css
View File

@ -1,4 +1,11 @@
/* HTML styles for the splash screen */ :root {
--sat: env(safe-area-inset-top);
--sar: env(safe-area-inset-right);
--sab: env(safe-area-inset-bottom);
--sal: env(safe-area-inset-left);
}
/* HTML styles for the splash screen */
.highlight { .highlight {
color: white; color: white;

1
demo/Semi.Avalonia.Demo.Web/AppBundle/index.html
View File

@ -10,7 +10,6 @@
<link rel="modulepreload" href="./dotnet.js" /> <link rel="modulepreload" href="./dotnet.js" />
<link rel="modulepreload" href="./avalonia.js" /> <link rel="modulepreload" href="./avalonia.js" />
<link rel="stylesheet" href="./app.css" /> <link rel="stylesheet" href="./app.css" />
<link rel="preconnect" href="https://fonts.googleapis.com">
</head> </head>
<body style="margin: 0px; overflow: hidden"> <body style="margin: 0px; overflow: hidden">

3
demo/Semi.Avalonia.Demo.Web/AppBundle/main.js
View File

@ -1,5 +1,4 @@
import { dotnet } from './dotnet.js' import { dotnet } from './dotnet.js'
import { registerAvaloniaModule } from './avalonia.js';
const is_browser = typeof window != "undefined"; const is_browser = typeof window != "undefined";
if (!is_browser) throw new Error(`Expected to be running in a browser`); if (!is_browser) throw new Error(`Expected to be running in a browser`);
@ -9,8 +8,6 @@ const dotnetRuntime = await dotnet
.withApplicationArgumentsFromQuery() .withApplicationArgumentsFromQuery()
.create(); .create();
await registerAvaloniaModule(dotnetRuntime);
const config = dotnetRuntime.getConfig(); const config = dotnetRuntime.getConfig();
await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]); await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);

11
demo/Semi.Avalonia.Demo.Web/Program.cs
View File

@ -1,17 +1,16 @@
using System.Runtime.Versioning; using System.Runtime.Versioning;
using System.Threading.Tasks;
using Avalonia; using Avalonia;
using Avalonia.Media;
using Semi.Avalonia.Demo.Web;
using Avalonia.Browser; using Avalonia.Browser;
[assembly: SupportedOSPlatform("browser")] [assembly: SupportedOSPlatform("browser")]
namespace Semi.Avalonia.Demo.Web;
internal partial class Program internal partial class Program
{ {
private static void Main(string[] args) private static async Task Main(string[] args) => await BuildAvaloniaApp()
{ .StartBrowserAppAsync("out");
BuildAvaloniaApp(); //.SetupBrowserApp("out");
}
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>(); => AppBuilder.Configure<App>();

9
demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
View File

@ -10,17 +10,8 @@
<WasmExtraFilesToDeploy Include="AppBundle\**" /> <WasmExtraFilesToDeploy Include="AppBundle\**" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="Assets\SourceHanSansCN-Regular.otf" />
</ItemGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\SourceHanSansCN-Regular.otf" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>