Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 03:07:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[QuickAccent]Fix unstable language loading (#36721)

Browse Source
This commit is contained in:
Jaime Bernardo
2025-01-13 15:13:50 +00:00
committed by GitHub
parent df48a33bb9
commit 4951a63352
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
View File

@@ -63,8 +63,15 @@ namespace Microsoft.PowerToys.Settings.UI.Views
this.QuickAccent_Language_Select.DeselectAll();
}
private bool loadingLanguageListDontTriggerSelectionChanged;
private void QuickAccent_SelectedLanguage_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (loadingLanguageListDontTriggerSelectionChanged)
{
return;
}
var listView = sender as ListView;
ViewModel.SelectedLanguageOptions = listView.SelectedItems
@@ -76,10 +83,13 @@ namespace Microsoft.PowerToys.Settings.UI.Views
private void QuickAccent_Language_Select_Loaded(object sender, RoutedEventArgs e)
{
loadingLanguageListDontTriggerSelectionChanged = true;
foreach (var languageOption in ViewModel.SelectedLanguageOptions)
{
this.QuickAccent_Language_Select.SelectedItems.Add(languageOption);
}
loadingLanguageListDontTriggerSelectionChanged = false;
}
}
}

1
src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
View File

@@ -115,6 +115,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
SelectedLanguageOptions = _powerAccentSettings.Properties.SelectedLang.Value.Split(',')
.Select(l => Languages.Find(lang => lang.LanguageCode == l))
.Where(l => l != null) // Wrongly typed languages will appear as null after find. We want to remove those to avoid crashes.
.ToArray();
}
else if (_powerAccentSettings.Properties.SelectedLang.Value.Contains("ALL"))