mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-12-20 13:55:54 +01:00
2b6cc4b353
* Add "Follow OS theme" option * Update App.axaml.cs * Add "Follow OS theme" option * Update App.axaml.cs * Remove `this` * Remove annotation for nullable reference * Change into switch expression to make it concise * Change comments to XML docs * Update en_US.json * Fix icons in About dialog do not response to "auto" theme The theme icons seemingly use Dark variant event when the OS theme is light. In addition, I added ThemeManager common to make it accessible for both App and AboutWindow * Newline at the end * newline moment * Update ThemeManager.cs * bait to switch to lf * change to lf * temp. revert * Add back ThemeManager.cs common, pls pass the format check * I found the mistake: should have put `ThemeManager.OnThemeChanged();` in try block Finally solve the formatting check * test formatting * Update App.axaml.cs * Ok i seem to forget to add version lol * Fix info CA1816
146 lines
5.0 KiB
C#
146 lines
5.0 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls.ApplicationLifetimes;
|
|
using Avalonia.Markup.Xaml;
|
|
using Avalonia.Platform;
|
|
using Avalonia.Styling;
|
|
using Avalonia.Threading;
|
|
using Ryujinx.Ava.Common;
|
|
using Ryujinx.Ava.Common.Locale;
|
|
using Ryujinx.Ava.UI.Helpers;
|
|
using Ryujinx.Ava.UI.Windows;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.UI.Common.Configuration;
|
|
using Ryujinx.UI.Common.Helper;
|
|
using System;
|
|
using System.Diagnostics;
|
|
|
|
namespace Ryujinx.Ava
|
|
{
|
|
public class App : Application
|
|
{
|
|
public override void Initialize()
|
|
{
|
|
Name = $"Ryujinx {Program.Version}";
|
|
|
|
AvaloniaXamlLoader.Load(this);
|
|
|
|
if (OperatingSystem.IsMacOS())
|
|
{
|
|
Process.Start("/usr/bin/defaults", "write org.ryujinx.Ryujinx ApplePressAndHoldEnabled -bool false");
|
|
}
|
|
}
|
|
|
|
public override void OnFrameworkInitializationCompleted()
|
|
{
|
|
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
|
{
|
|
desktop.MainWindow = new MainWindow();
|
|
}
|
|
|
|
base.OnFrameworkInitializationCompleted();
|
|
|
|
if (Program.PreviewerDetached)
|
|
{
|
|
ApplyConfiguredTheme();
|
|
|
|
ConfigurationState.Instance.UI.BaseStyle.Event += ThemeChanged_Event;
|
|
ConfigurationState.Instance.UI.CustomThemePath.Event += ThemeChanged_Event;
|
|
ConfigurationState.Instance.UI.EnableCustomTheme.Event += CustomThemeChanged_Event;
|
|
}
|
|
}
|
|
|
|
private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e)
|
|
{
|
|
ApplyConfiguredTheme();
|
|
}
|
|
|
|
private void ShowRestartDialog()
|
|
{
|
|
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
|
Dispatcher.UIThread.InvokeAsync(async () =>
|
|
{
|
|
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
|
{
|
|
var result = await ContentDialogHelper.CreateConfirmationDialog(
|
|
LocaleManager.Instance[LocaleKeys.DialogThemeRestartMessage],
|
|
LocaleManager.Instance[LocaleKeys.DialogThemeRestartSubMessage],
|
|
LocaleManager.Instance[LocaleKeys.InputDialogYes],
|
|
LocaleManager.Instance[LocaleKeys.InputDialogNo],
|
|
LocaleManager.Instance[LocaleKeys.DialogRestartRequiredMessage]);
|
|
|
|
if (result == UserResult.Yes)
|
|
{
|
|
var path = Environment.ProcessPath;
|
|
var proc = Process.Start(path, CommandLineState.Arguments);
|
|
desktop.Shutdown();
|
|
Environment.Exit(0);
|
|
}
|
|
}
|
|
});
|
|
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
|
|
}
|
|
|
|
private void ThemeChanged_Event(object sender, ReactiveEventArgs<string> e)
|
|
{
|
|
ApplyConfiguredTheme();
|
|
}
|
|
|
|
public void ApplyConfiguredTheme()
|
|
{
|
|
try
|
|
{
|
|
string baseStyle = ConfigurationState.Instance.UI.BaseStyle;
|
|
|
|
if (string.IsNullOrWhiteSpace(baseStyle))
|
|
{
|
|
ConfigurationState.Instance.UI.BaseStyle.Value = "Auto";
|
|
|
|
baseStyle = ConfigurationState.Instance.UI.BaseStyle;
|
|
}
|
|
|
|
ThemeVariant systemTheme = DetectSystemTheme();
|
|
|
|
ThemeManager.OnThemeChanged();
|
|
|
|
RequestedThemeVariant = baseStyle switch
|
|
{
|
|
"Auto" => systemTheme,
|
|
"Light" => ThemeVariant.Light,
|
|
"Dark" => ThemeVariant.Dark,
|
|
_ => ThemeVariant.Default,
|
|
};
|
|
}
|
|
catch (Exception)
|
|
{
|
|
Logger.Warning?.Print(LogClass.Application, "Failed to Apply Theme. A restart is needed to apply the selected theme");
|
|
|
|
ShowRestartDialog();
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Converts a PlatformThemeVariant value to the corresponding ThemeVariant value.
|
|
/// </summary>
|
|
public static ThemeVariant ConvertThemeVariant(PlatformThemeVariant platformThemeVariant) =>
|
|
platformThemeVariant switch
|
|
{
|
|
PlatformThemeVariant.Dark => ThemeVariant.Dark,
|
|
PlatformThemeVariant.Light => ThemeVariant.Light,
|
|
_ => ThemeVariant.Default,
|
|
};
|
|
|
|
public static ThemeVariant DetectSystemTheme()
|
|
{
|
|
if (Application.Current is App app)
|
|
{
|
|
var colorValues = app.PlatformSettings.GetColorValues();
|
|
|
|
return ConvertThemeVariant(colorValues.ThemeVariant);
|
|
}
|
|
|
|
return ThemeVariant.Default;
|
|
}
|
|
}
|
|
}
|