Browse Source

Make it work after merge conflicts

pull/11488/head
Max Katz 3 years ago
parent
commit
9b95fa5803
  1. 4
      src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
  2. 3
      src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs

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

@ -2,12 +2,8 @@
<PropertyGroup>
<TargetFrameworks>net461;net6.0-windows</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<UseWpf>true</UseWpf>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<UseDirect3D9>true</UseDirect3D9>
<PackageId>Avalonia.Win32.Interoperability</PackageId>
</PropertyGroup>

3
src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs

@ -52,7 +52,7 @@ public class WinFormsAvaloniaControlHost : WinFormsControl
_root = new();
_root.Content = _content;
_root.Prepare();
_root.Renderer.Start();
_root.StartRendering();
_root.GotFocus += RootGotFocus;
FixPosition();
@ -64,6 +64,7 @@ public class WinFormsAvaloniaControlHost : WinFormsControl
/// <inheritdoc />
protected override void OnHandleDestroyed(EventArgs e)
{
_root?.StopRendering();
_root?.Dispose();
_root = null;
base.OnHandleDestroyed(e);

Loading…
Cancel
Save