Browse Source

Naming and a bit of cleanup

xamlil-debug-info
Nikita Tsukanov 7 years ago
parent
commit
6d83479d0d
  1. 8
      samples/ControlCatalog/MainView.xaml.cs
  2. 10
      src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs

8
samples/ControlCatalog/MainView.xaml.cs

@ -15,7 +15,7 @@ namespace ControlCatalog
{
public MainView()
{
this.InitializeComponent();
AvaloniaXamlLoader.Load(this);
if (AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().IsDesktop)
{
IList tabItems = ((IList)this.FindControl<TabControl>("Sidebar").Items);
@ -60,11 +60,5 @@ namespace ControlCatalog
};
Styles.Add(light);
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
AvaloniaXamlIlRuntimeCompiler.DumpRuntimeCompilationResults();
}
}
}

10
src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs

@ -26,7 +26,7 @@ namespace Avalonia.Markup.Xaml
{
public bool IsDesignMode { get; set; }
public bool EnforceCompilerForRuntimeXaml { get; set; } = true;
public bool UseLegacyXamlLoader { get; set; } = false;
/// <summary>
/// Initializes a new instance of the <see cref="AvaloniaXamlLoader"/> class.
@ -162,12 +162,10 @@ namespace Avalonia.Markup.Xaml
/// <returns>The loaded object.</returns>
public object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null)
{
if (EnforceCompilerForRuntimeXaml)
{
if (!UseLegacyXamlLoader)
return AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri);
}
var readerSettings = new XamlXmlReaderSettings()
{
BaseUri = uri,

Loading…
Cancel
Save