mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-23 18:01:22 -08:00
deb99d2cae
* avalonia part 1 * remove vulkan ui backend * move ui common files to ui common project * get name for oading screen from device * rebase. * review 1 * review 1.1 * review * cleanup * addressed review * use cancellation token * review * review * rebased * cancel library loading when closing window * remove star image, use fonticon instead * delete render control frame buffer when game ends. change position of fav star * addressed @Thog review * ensure the right ui is downloaded in updates * fix crash when showing not supported dialog during controller request * add prefix to artifact names * Auto-format Avalonia project * Fix input * Fix build, simplify app disposal * remove nv stutter thread * addressed review * add missing change * maintain window size if new size is zero length * add game, handheld, docked to local * reverse scale main window * Update de_DE.json * Update de_DE.json * Update de_DE.json * Update italian json * Update it_IT.json * let render timer poll with no wait * remove unused code * more unused code * enabled tiered compilation and trimming * check if window event is not closed before signaling * fix atmospher case * locale fix * locale fix * remove explicit tiered compilation declarations * Remove ) it_IT.json * Remove ) de_DE.json * Update it_IT.json * Update pt_BR locale with latest strings * Remove ')' * add more strings to locale * update locale * remove extra slash * remove extra slash * set firmware version to 0 if key's not found * fix * revert timer changes * lock on object instead * Update it_IT.json * remove unused method * add load screen text to locale * drop swap event * Update de_DE.json * Update de_DE.json * do null check when stopping emulator * Update de_DE.json * Create tr_TR.json * Add tr_TR * Add tr_TR + Turkish * Update it_IT.json * Update Ryujinx.Ava/Input/AvaloniaMappingHelper.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * addressed review * Update Ryujinx.Ava/Ui/Backend/OpenGl/OpenGlRenderTarget.cs Co-authored-by: gdkchan <gab.dark.100@gmail.com> * use avalonia's inbuilt renderer on linux * removed whitespace * workaround for queue render crash with vsync off * drop custom backend * format files * fix not closing issue * remove warnings * rebase * update avalonia library * Reposition the Text and Button on About Page * Assign build version * Remove appveyor text Co-authored-by: gdk <gab.dark.100@gmail.com> Co-authored-by: Niwu34 <67392333+Niwu34@users.noreply.github.com> Co-authored-by: Antonio Brugnolo <36473846+AntoSkate@users.noreply.github.com> Co-authored-by: aegiff <99728970+aegiff@users.noreply.github.com> Co-authored-by: Ac_K <Acoustik666@gmail.com> Co-authored-by: MostlyWhat <78652091+MostlyWhat@users.noreply.github.com>
126 lines
4.2 KiB
C#
126 lines
4.2 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls.ApplicationLifetimes;
|
|
using Avalonia.Markup.Xaml;
|
|
using Avalonia.Styling;
|
|
using Avalonia.Threading;
|
|
using FluentAvalonia.Styling;
|
|
using Ryujinx.Ava.Ui.Windows;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Ui.Common.Configuration;
|
|
using System;
|
|
using System.IO;
|
|
|
|
namespace Ryujinx.Ava
|
|
{
|
|
public class App : Avalonia.Application
|
|
{
|
|
public override void Initialize()
|
|
{
|
|
AvaloniaXamlLoader.Load(this);
|
|
}
|
|
|
|
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()
|
|
{
|
|
// TODO. Implement Restart Dialog when SettingsWindow is implemented.
|
|
}
|
|
|
|
private void ThemeChanged_Event(object sender, ReactiveEventArgs<string> e)
|
|
{
|
|
ApplyConfiguredTheme();
|
|
}
|
|
|
|
private void ApplyConfiguredTheme()
|
|
{
|
|
try
|
|
{
|
|
string baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
|
|
string themePath = ConfigurationState.Instance.Ui.CustomThemePath;
|
|
bool enableCustomTheme = ConfigurationState.Instance.Ui.EnableCustomTheme;
|
|
|
|
const string BaseStyleUrl = "avares://Ryujinx.Ava/Assets/Styles/Base{0}.xaml";
|
|
|
|
if (string.IsNullOrWhiteSpace(baseStyle))
|
|
{
|
|
ConfigurationState.Instance.Ui.BaseStyle.Value = "Dark";
|
|
|
|
baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
|
|
}
|
|
|
|
var theme = AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>();
|
|
|
|
theme.RequestedTheme = baseStyle;
|
|
|
|
var currentStyles = this.Styles;
|
|
|
|
// Remove all styles except the base style.
|
|
if (currentStyles.Count > 1)
|
|
{
|
|
currentStyles.RemoveRange(1, currentStyles.Count - 1);
|
|
}
|
|
|
|
IStyle newStyles = null;
|
|
|
|
// Load requested style, and fallback to Dark theme if loading failed.
|
|
try
|
|
{
|
|
newStyles = (Styles)AvaloniaXamlLoader.Load(new Uri(string.Format(BaseStyleUrl, baseStyle), UriKind.Absolute));
|
|
}
|
|
catch (XamlLoadException)
|
|
{
|
|
newStyles = (Styles)AvaloniaXamlLoader.Load(new Uri(string.Format(BaseStyleUrl, "Dark"), UriKind.Absolute));
|
|
}
|
|
|
|
currentStyles.Add(newStyles);
|
|
|
|
if (enableCustomTheme)
|
|
{
|
|
if (!string.IsNullOrWhiteSpace(themePath))
|
|
{
|
|
try
|
|
{
|
|
var themeContent = File.ReadAllText(themePath);
|
|
var customStyle = AvaloniaRuntimeXamlLoader.Parse<IStyle>(themeContent);
|
|
|
|
currentStyles.Add(customStyle);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.Error?.Print(LogClass.Application, $"Failed to Apply Custom Theme. Error: {ex.Message}");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch (Exception)
|
|
{
|
|
Logger.Warning?.Print(LogClass.Application, "Failed to Apply Theme. A restart is needed to apply the selected theme");
|
|
|
|
ShowRestartDialog();
|
|
}
|
|
}
|
|
}
|
|
} |