The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-22 17:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Postpone language packs list population until control Load event

Browse Source
This commit is contained in:
Korney Czukowski 2018-02-08 21:44:28 +01:00
parent 5202099ab0
commit 45ca80a494
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DS4Windows/DS4Forms/LanguagePackComboBox.Designer.cs generated
View File

@ -55,6 +55,7 @@
this.Controls.Add(this.cbCulture);
this.Controls.Add(this.label1);
this.Name = "LanguagePackComboBox";
this.Load += new System.EventHandler(this.LanguagePackComboBox_Load);
this.SizeChanged += new System.EventHandler(this.LanguagePackComboBox_SizeChanged);
this.Resize += new System.EventHandler(this.LanguagePackComboBox_SizeChanged);
this.ResumeLayout(false);

29
DS4Windows/DS4Forms/LanguagePackComboBox.cs
View File

@ -78,19 +78,6 @@ namespace DS4Windows.DS4Forms
{
InitializeComponent();
cbCulture.Enabled = false;
Task.Run(() => {
// Find available language assemblies and bind the list to the combo box.
cbCulture.DataSource = CreateLanguageAssembliesBindingSource();
cbCulture.SelectedValue = Thread.CurrentThread.CurrentUICulture.Name;
// This must be set here instead of Designer or event would fire at initial selected value setting above.
cbCulture.SelectedIndexChanged += new EventHandler(CbCulture_SelectedIndexChanged);
cbCulture.SelectedValueChanged += new EventHandler(CbCulture_SelectedValueChanged);
cbCulture.Enabled = true;
LanguageListInitialized.SetResult(true);
});
}
private BindingSource CreateLanguageAssembliesBindingSource()
@ -143,5 +130,21 @@ namespace DS4Windows.DS4Forms
{
SelectedValueChanged?.Invoke(this, e);
}
private void LanguagePackComboBox_Load(object sender, EventArgs e)
{
Invoke(new Action(() => {
// Find available language assemblies and bind the list to the combo box.
cbCulture.DataSource = CreateLanguageAssembliesBindingSource();
cbCulture.SelectedValue = Thread.CurrentThread.CurrentUICulture.Name;
// This must be set here instead of Designer or event would fire at initial selected value setting above.
cbCulture.SelectedIndexChanged += new EventHandler(CbCulture_SelectedIndexChanged);
cbCulture.SelectedValueChanged += new EventHandler(CbCulture_SelectedValueChanged);
cbCulture.Enabled = true;
LanguageListInitialized.SetResult(true);
}));
}
}
}