Fix LocaleExtension SetRawSource usages + language perf improvement (…

…#7121) * Avoid Avalonia CompiledBindingPathBuilder.SetRawSource * Improve UI language change performance
djnandinho26 · Aug 4, 2024 · e85ee67 · e85ee67
1 parent 42f22fe
commit e85ee67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Ryujinx/Common/Locale/LocaleExtension.cs b/src/Ryujinx/Common/Locale/LocaleExtension.cs
@@ -21,7 +21,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             var builder = new CompiledBindingPathBuilder();
 
-            builder.SetRawSource(LocaleManager.Instance)
+            builder
                 .Property(new ClrPropertyInfo("Item",
                 obj => (LocaleManager.Instance[keyToUse]),
                 null,
@@ -32,7 +32,10 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             var path = builder.Build();
 
-            var binding = new CompiledBindingExtension(path);
+            var binding = new CompiledBindingExtension(path)
+            {
+                Source = LocaleManager.Instance
+            };
 
             return binding.ProvideValue(serviceProvider);
         }

diff --git a/src/Ryujinx/Common/Locale/LocaleManager.cs b/src/Ryujinx/Common/Locale/LocaleManager.cs
@@ -139,9 +139,11 @@ public void LoadLanguage(string languageCode)
 
             foreach (var item in locale)
             {
-                this[item.Key] = item.Value;
+                _localeStrings[item.Key] = item.Value;
             }
 
+            OnPropertyChanged("Item");
+
             LocaleChanged?.Invoke();
         }