CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-06-08 13:34:54 +12:00
Code Issues Projects Releases Wiki Activity

show loading page while mods are loading

Browse source
This commit is contained in:
Jack Baron 2020-02-03 03:01:32 +00:00
parent 96710f8596
commit 613c5c4e40
No known key found for this signature in database
GPG key ID: CD10BCEEC646C064
2 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ModAssistant/MainWindow.xaml.cs
View file

@ -65,9 +65,7 @@ namespace ModAssistant
Main.Content = Intro.Instance;
break;
case "Mods":
Mods.Instance.LoadMods();
ModsOpened = true;
Main.Content = Mods.Instance;
_ = ShowModsPage();
break;
case "About":
Main.Content = About.Instance;
@ -139,24 +137,33 @@ namespace ModAssistant
return versions[0];
}
private void ModsButton_Click(object sender, RoutedEventArgs e)
private async Task ShowModsPage()
{
Main.Content = Mods.Instance;
Properties.Settings.Default.LastTab = "Mods";
Properties.Settings.Default.Save();
if (!ModsOpened)
void OpenModsPage()
{
Mods.Instance.LoadMods();
ModsOpened = true;
Main.Content = Mods.Instance;
Properties.Settings.Default.LastTab = "Mods";
Properties.Settings.Default.Save();
}
if (ModsOpened == true && Mods.Instance.PendingChanges == false)
{
OpenModsPage();
return;
}
if (Mods.Instance.PendingChanges)
{
Mods.Instance.LoadMods();
Mods.Instance.PendingChanges = false;
}
Main.Content = Loading.Instance;
await Mods.Instance.LoadMods();
if (ModsOpened == false) ModsOpened = true;
if (Mods.Instance.PendingChanges == true) Mods.Instance.PendingChanges = false;
OpenModsPage();
}
private void ModsButton_Click(object sender, RoutedEventArgs e)
{
_ = ShowModsPage();
}
private void IntroButton_Click(object sender, RoutedEventArgs e)
@ -204,12 +211,12 @@ namespace ModAssistant
}
}
private void GameVersionsBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
private async void GameVersionsBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
string oldGameVersion = GameVersion;
GameVersion = (sender as ComboBox).SelectedItem.ToString();
string oldGameVersion = GameVersion;
GameVersion = (sender as ComboBox).SelectedItem.ToString();
if (string.IsNullOrEmpty(oldGameVersion)) return;
Properties.Settings.Default.GameVersion = GameVersion;
@ -217,7 +224,12 @@ namespace ModAssistant
if (ModsOpened)
{
Mods.Instance.LoadMods();
var prevPage = Main.Content;
Mods.Instance.PendingChanges = true;
await ShowModsPage();
Main.Content = prevPage;
}
}

2
ModAssistant/Pages/Mods.xaml.cs
View file

@ -46,7 +46,7 @@ namespace ModAssistant.Pages
}
}
public async void LoadMods()
public async Task LoadMods()
{
var versionLoadSuccess = await MainWindow.Instance.VersionLoadStatus.Task;
if (versionLoadSuccess == false) return;