Browse Source

Merge pull request #7296 from AvaloniaUI/fixes/controlcatalog-web

fix controlcatalog.web
pull/7298/head
Max Katz 5 years ago
committed by GitHub
parent
commit
e27bc249d3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      samples/ControlCatalog.Web/ControlCatalog.Web.csproj
  2. 12
      samples/ControlCatalog/App.xaml.cs

1
samples/ControlCatalog.Web/ControlCatalog.Web.csproj

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<WasmBuildNative>True</WasmBuildNative>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

12
samples/ControlCatalog/App.xaml.cs

@ -89,16 +89,18 @@ namespace ControlCatalog
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime) if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopLifetime)
{ {
desktopLifetime.MainWindow = new MainWindow(); desktopLifetime.MainWindow = new MainWindow();
this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
{
StartupScreenIndex = 1,
});
} }
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime) else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewLifetime)
{
singleViewLifetime.MainView = new MainView(); singleViewLifetime.MainView = new MainView();
}
base.OnFrameworkInitializationCompleted(); base.OnFrameworkInitializationCompleted();
this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
{
StartupScreenIndex = 1,
});
} }
} }
} }

Loading…
Cancel
Save