소스 검색

Naming and a bit of cleanup

Nikita Tsukanov 6 년 전
부모
커밋
6d83479d0d
2개의 변경된 파일5개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 7
      samples/ControlCatalog/MainView.xaml.cs
  2. 4 6
      src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs

+ 1 - 7
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();
-        }
     }
 }

+ 4 - 6
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,