From 7766d71f615a56d5b844ebcf87c678827e2e3e31 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 17 Jan 2019 01:25:21 +0300 Subject: [PATCH] Use X11 backend for Linux by default --- samples/ControlCatalog.NetCore/Program.cs | 2 +- src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs | 6 +++--- src/Avalonia.Desktop/Avalonia.Desktop.csproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs index 7b61359ec8..57c8b700df 100644 --- a/samples/ControlCatalog.NetCore/Program.cs +++ b/samples/ControlCatalog.NetCore/Program.cs @@ -43,7 +43,7 @@ namespace ControlCatalog.NetCore /// This method is needed for IDE previewer infrastructure /// public static AppBuilder BuildAvaloniaApp() - => AppBuilder.Configure().UseX11().UseSkia().UseReactiveUI(); + => AppBuilder.Configure().UsePlatformDetect().UseSkia().UseReactiveUI(); static void ConsoleSilencer() { diff --git a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs index 4db6de353f..36f762d625 100644 --- a/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs +++ b/src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs @@ -29,7 +29,7 @@ namespace Avalonia } else { - LoadGtk3(builder); + LoadX11(builder); LoadSkia(builder); } return builder; @@ -42,9 +42,9 @@ namespace Avalonia where TAppBuilder : AppBuilderBase, new() => builder.UseWin32(); - static void LoadGtk3(TAppBuilder builder) + static void LoadX11(TAppBuilder builder) where TAppBuilder : AppBuilderBase, new() - => builder.UseGtk3(); + => builder.UseX11(); static void LoadDirect2D1(TAppBuilder builder) where TAppBuilder : AppBuilderBase, new() diff --git a/src/Avalonia.Desktop/Avalonia.Desktop.csproj b/src/Avalonia.Desktop/Avalonia.Desktop.csproj index 52fee8a291..f7c06306f5 100644 --- a/src/Avalonia.Desktop/Avalonia.Desktop.csproj +++ b/src/Avalonia.Desktop/Avalonia.Desktop.csproj @@ -7,8 +7,8 @@ - +