diff --git a/GenshinLauncher/Bootstrapper.cs b/GenshinLauncher/Bootstrapper.cs index 58b4170..5b40023 100644 --- a/GenshinLauncher/Bootstrapper.cs +++ b/GenshinLauncher/Bootstrapper.cs @@ -1,7 +1,6 @@ using System.Diagnostics; using System.Windows; using System.Windows.Documents; -using System.Windows.Input; using System.Windows.Navigation; using GenshinLauncher.ViewModels; using Stylet; @@ -24,10 +23,6 @@ protected override void Configure() }); }) ); - - if (Keyboard.Modifiers.HasFlag(ModifierKeys.Shift)) - { - } } } } \ No newline at end of file diff --git a/GenshinLauncher/Config.cs b/GenshinLauncher/Config.cs index 77559de..04d9ccf 100644 --- a/GenshinLauncher/Config.cs +++ b/GenshinLauncher/Config.cs @@ -1,28 +1,9 @@ -namespace GenshinLauncher { - - - // This class allows you to handle specific events on the settings class: - // The SettingChanging event is raised before a setting's value is changed. - // The PropertyChanged event is raised after a setting's value is changed. - // The SettingsLoaded event is raised after the setting values are loaded. - // The SettingsSaving event is raised before the setting values are saved. - internal sealed partial class Config { - - public Config() { - // // To add event handlers for saving and changing settings, uncomment the lines below: - // - // this.SettingChanging += this.SettingChangingEventHandler; - // - // this.SettingsSaving += this.SettingsSavingEventHandler; - // - } - - private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) { - // Add code to handle the SettingChangingEvent event here. - } - - private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) { - // Add code to handle the SettingsSaving event here. - } +using System.ComponentModel; + +namespace GenshinLauncher +{ + internal sealed partial class Config + { + protected override void OnPropertyChanged(object sender, PropertyChangedEventArgs e) => Save(); } -} +} \ No newline at end of file diff --git a/GenshinLauncher/GenshinLauncher.csproj b/GenshinLauncher/GenshinLauncher.csproj index 3f3466c..acdd674 100644 --- a/GenshinLauncher/GenshinLauncher.csproj +++ b/GenshinLauncher/GenshinLauncher.csproj @@ -13,7 +13,7 @@ https://github.com/sabihoshi/GenshinLauncher A Genshin Impact launcher with more options in Modern Fluent UI. GenshinImpactIcon.ico - 1.1.0 + 1.1.0.1 diff --git a/GenshinLauncher/ViewModels/MainWindowViewModel.cs b/GenshinLauncher/ViewModels/MainWindowViewModel.cs index d0b991b..576a207 100644 --- a/GenshinLauncher/ViewModels/MainWindowViewModel.cs +++ b/GenshinLauncher/ViewModels/MainWindowViewModel.cs @@ -20,30 +20,25 @@ public MainWindowViewModel() public Resolution Resolution { get; set; } - public string Title { get; } = "Genshin Impact Launcher"; - [UserScopedSetting] public string GenshinLocation { get; set; } = @"C:\Program Files\Genshin Impact\Genshin Impact Game\GenshinImpact.exe"; + public string Title { get; } = "Genshin Impact Launcher"; + public async Task LaunchSelector() => await Client.WithArguments("-show-screen-selector") - .ExecuteAsync(); - - protected override void OnClose() - { - Config.Default.Save(); - } + .ExecuteAsync(); public void LaunchGame() { var client = Client - .WithArguments(args => + .WithArguments(args => { args - .Add("-screen-width").Add(Resolution.Width) - .Add("-screen-height").Add(Resolution.Height) - .Add("-screen-fullscreen").Add(Config.Default.Fullscreen ? 1 : 0); + .Add("-screen-width").Add(Resolution.Width) + .Add("-screen-height").Add(Resolution.Height) + .Add("-screen-fullscreen").Add(Config.Default.Fullscreen ? 1 : 0); if (Config.Default.Borderless) args.Add("-popupwindow");