Browse Source

Merge pull request #5155 from AvaloniaUI/fixes/egl-init-windows

[Windows] only enable egl by default on platforms where its stable.
pull/5161/head
Dan Walmsley 6 years ago
committed by GitHub
parent
commit
9af2cfa3e1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      samples/ControlCatalog.NetCore/Program.cs
  2. 3
      src/Windows/Avalonia.Win32/Win32Platform.cs

3
samples/ControlCatalog.NetCore/Program.cs

@ -113,8 +113,7 @@ namespace ControlCatalog.NetCore
}) })
.With(new Win32PlatformOptions .With(new Win32PlatformOptions
{ {
EnableMultitouch = true, EnableMultitouch = true
AllowEglInitialization = true
}) })
.UseSkia() .UseSkia()
.UseManagedSystemDialogs() .UseManagedSystemDialogs()

3
src/Windows/Avalonia.Win32/Win32Platform.cs

@ -17,6 +17,7 @@ using Avalonia.Platform;
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.Threading; using Avalonia.Threading;
using Avalonia.Utilities; using Avalonia.Utilities;
using Avalonia.Win32;
using Avalonia.Win32.Input; using Avalonia.Win32.Input;
using Avalonia.Win32.Interop; using Avalonia.Win32.Interop;
using static Avalonia.Win32.Interop.UnmanagedMethods; using static Avalonia.Win32.Interop.UnmanagedMethods;
@ -39,7 +40,7 @@ namespace Avalonia
public class Win32PlatformOptions public class Win32PlatformOptions
{ {
public bool UseDeferredRendering { get; set; } = true; public bool UseDeferredRendering { get; set; } = true;
public bool AllowEglInitialization { get; set; } = true; public bool AllowEglInitialization { get; set; } = Win32Platform.WindowsVersion > new Version(6, 1);
public bool? EnableMultitouch { get; set; } public bool? EnableMultitouch { get; set; }
public bool OverlayPopups { get; set; } public bool OverlayPopups { get; set; }
public bool UseWgl { get; set; } public bool UseWgl { get; set; }

Loading…
Cancel
Save