Browse Source

Use Skia in windows interop test + remove old hacks for old wpf control

pull/11488/head
Max Katz 3 years ago
parent
commit
7bf2b7668c
  1. 7
      samples/interop/WindowsInteropTest/Program.cs
  2. 1
      samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
  3. 1
      src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj

7
samples/interop/WindowsInteropTest/Program.cs

@ -16,12 +16,7 @@ namespace WindowsInteropTest
System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
AppBuilder.Configure<App>() AppBuilder.Configure<App>()
.UseWin32() .UseWin32()
.UseDirect2D1() .UseSkia()
.With(new Win32PlatformOptions
{
UseWindowsUIComposition = false,
ShouldRenderOnUIThread = true // necessary for WPF
})
.SetupWithoutStarting(); .SetupWithoutStarting();
System.Windows.Forms.Application.Run(new SelectorForm()); System.Windows.Forms.Application.Run(new SelectorForm());
} }

1
samples/interop/WindowsInteropTest/WindowsInteropTest.csproj

@ -8,6 +8,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" /> <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
<ProjectReference Include="..\..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
<ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32.Interoperability\Avalonia.Win32.Interoperability.csproj" /> <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32.Interoperability\Avalonia.Win32.Interoperability.csproj" />
<ProjectReference Include="..\..\ControlCatalog\ControlCatalog.csproj" /> <ProjectReference Include="..\..\ControlCatalog\ControlCatalog.csproj" />
</ItemGroup> </ItemGroup>

1
src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj

@ -10,7 +10,6 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" /> <ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
<ProjectReference Include="..\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\..\build\NullableEnable.props" /> <Import Project="..\..\..\build\NullableEnable.props" />

Loading…
Cancel
Save