From 19c15f64dc5779ff54bd70ecc3a01f9aafec941f Mon Sep 17 00:00:00 2001 From: RoxCian <40283094+RoxCian@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:45:38 +0800 Subject: [PATCH] Update method LanguageComboBox_SelectChanged. Reuse the index from _cultureInfoNameSource. --- UICatalog/Scenarios/Localization.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/UICatalog/Scenarios/Localization.cs b/UICatalog/Scenarios/Localization.cs index 50d2ae169..fe2fca3ac 100644 --- a/UICatalog/Scenarios/Localization.cs +++ b/UICatalog/Scenarios/Localization.cs @@ -24,8 +24,8 @@ namespace UICatalog.Scenarios { _cultureInfoSource = Application.SupportedCultures.Append (CultureInfo.InvariantCulture).ToArray (); _cultureInfoNameSource = Application.SupportedCultures.Select (c => $"{c.NativeName} ({c.Name})").Append ("Invariant").ToArray (); var languageMenus = Application.SupportedCultures - .Select (c => new MenuItem ($"{c.NativeName} ({c.Name})", "", () => SetCulture (c)) - ).Concat ( + .Select (c => new MenuItem ($"{c.NativeName} ({c.Name})", "", () => SetCulture (c))) + .Concat ( new MenuItem [] { null, new MenuItem ("Invariant", "", () => SetCulture (CultureInfo.InvariantCulture)) @@ -130,9 +130,9 @@ namespace UICatalog.Scenarios { private void LanguageComboBox_SelectChanged (object sender, ListViewItemEventArgs e) { if (e.Value is string cultureName) { - var item = Array.IndexOf (_cultureInfoNameSource, cultureName); - if (item >= 0) { - SetCulture (_cultureInfoSource [Array.IndexOf (_cultureInfoNameSource, cultureName)]); + var index = Array.IndexOf (_cultureInfoNameSource, cultureName); + if (index >= 0) { + SetCulture (_cultureInfoSource [index]); } } } @@ -148,7 +148,9 @@ namespace UICatalog.Scenarios { dialog.MustExist = !isSaveFile; dialog.AllowsMultipleSelection = !isSaveFile; _currentOpenMode++; - if (_currentOpenMode > OpenMode.Mixed) _currentOpenMode = OpenMode.File; + if (_currentOpenMode > OpenMode.Mixed) { + _currentOpenMode = OpenMode.File; + } Application.Run (dialog); } public void ShowWizard ()