Compare commits
10 Commits
Canary-1.2
...
Canary-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ca4d6e921 | ||
|
|
f0aa7eedf6 | ||
|
|
41acc4b1f3 | ||
|
|
7aede70ba9 | ||
|
|
a0a4f78cff | ||
|
|
16a60fdf12 | ||
|
|
4d7350fc6e | ||
|
|
b05eab21a2 | ||
|
|
ff667a5c84 | ||
|
|
2f540dc88c |
@@ -838,6 +838,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
|||||||
TargetApi.OpenGL => TargetLanguage.Glsl,
|
TargetApi.OpenGL => TargetLanguage.Glsl,
|
||||||
TargetApi.Vulkan => GraphicsConfig.EnableSpirvCompilationOnVulkan ? TargetLanguage.Spirv : TargetLanguage.Glsl,
|
TargetApi.Vulkan => GraphicsConfig.EnableSpirvCompilationOnVulkan ? TargetLanguage.Spirv : TargetLanguage.Glsl,
|
||||||
TargetApi.Metal => TargetLanguage.Msl,
|
TargetApi.Metal => TargetLanguage.Msl,
|
||||||
|
_ => throw new NotImplementedException()
|
||||||
};
|
};
|
||||||
|
|
||||||
return new TranslationOptions(lang, api, flags);
|
return new TranslationOptions(lang, api, flags);
|
||||||
|
|||||||
@@ -1767,6 +1767,7 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
Constants.StorageBuffersSetIndex => Constants.StorageBuffersIndex,
|
Constants.StorageBuffersSetIndex => Constants.StorageBuffersIndex,
|
||||||
Constants.TexturesSetIndex => Constants.TexturesIndex,
|
Constants.TexturesSetIndex => Constants.TexturesIndex,
|
||||||
Constants.ImagesSetIndex => Constants.ImagesIndex,
|
Constants.ImagesSetIndex => Constants.ImagesIndex,
|
||||||
|
_ => throw new NotImplementedException()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,9 +21,12 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
private Pipeline _pipeline;
|
private Pipeline _pipeline;
|
||||||
private Window _window;
|
private Window _window;
|
||||||
|
|
||||||
public uint ProgramCount { get; set; } = 0;
|
public uint ProgramCount { get; set; }
|
||||||
|
|
||||||
|
#pragma warning disable CS0067 // The event is never used
|
||||||
public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
|
public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
|
||||||
|
#pragma warning restore CS0067
|
||||||
|
|
||||||
public bool PreferThreading => true;
|
public bool PreferThreading => true;
|
||||||
public IPipeline Pipeline => _pipeline;
|
public IPipeline Pipeline => _pipeline;
|
||||||
public IWindow Window => _window;
|
public IWindow Window => _window;
|
||||||
|
|||||||
@@ -125,6 +125,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
|
|||||||
Instruction.Add => "PreciseFAdd",
|
Instruction.Add => "PreciseFAdd",
|
||||||
Instruction.Subtract => "PreciseFSub",
|
Instruction.Subtract => "PreciseFSub",
|
||||||
Instruction.Multiply => "PreciseFMul",
|
Instruction.Multiply => "PreciseFMul",
|
||||||
|
_ => throw new NotImplementedException()
|
||||||
};
|
};
|
||||||
|
|
||||||
return $"{func}({expr[0]}, {expr[1]})";
|
return $"{func}({expr[0]}, {expr[1]})";
|
||||||
|
|||||||
@@ -1034,16 +1034,16 @@ namespace Ryujinx.HLE.FileSystem
|
|||||||
switch (fileName)
|
switch (fileName)
|
||||||
{
|
{
|
||||||
case "prod.keys":
|
case "prod.keys":
|
||||||
verified = verifyKeys(lines, genericPattern);
|
verified = VerifyKeys(lines, genericPattern);
|
||||||
break;
|
break;
|
||||||
case "title.keys":
|
case "title.keys":
|
||||||
verified = verifyKeys(lines, titlePattern);
|
verified = VerifyKeys(lines, titlePattern);
|
||||||
break;
|
break;
|
||||||
case "console.keys":
|
case "console.keys":
|
||||||
verified = verifyKeys(lines, genericPattern);
|
verified = VerifyKeys(lines, genericPattern);
|
||||||
break;
|
break;
|
||||||
case "dev.keys":
|
case "dev.keys":
|
||||||
verified = verifyKeys(lines, genericPattern);
|
verified = VerifyKeys(lines, genericPattern);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
|
throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
|
||||||
@@ -1056,20 +1056,22 @@ namespace Ryujinx.HLE.FileSystem
|
|||||||
{
|
{
|
||||||
throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
|
throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private bool verifyKeys(string[] lines, string regex)
|
return;
|
||||||
{
|
|
||||||
foreach (string line in lines)
|
bool VerifyKeys(string[] lines, string regex)
|
||||||
{
|
{
|
||||||
if (!Regex.IsMatch(line, regex))
|
foreach (string line in lines)
|
||||||
{
|
{
|
||||||
return false;
|
if (!Regex.IsMatch(line, regex))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool AreKeysAlredyPresent(string pathToCheck)
|
public bool AreKeysAlredyPresent(string pathToCheck)
|
||||||
{
|
{
|
||||||
string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };
|
string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };
|
||||||
|
|||||||
BIN
src/Ryujinx.UI.Common/Resources/Logo_Ryujinx_AntiAlias.png
Normal file
BIN
src/Ryujinx.UI.Common/Resources/Logo_Ryujinx_AntiAlias.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 609 KiB |
@@ -33,7 +33,7 @@
|
|||||||
<EmbeddedResource Include="Resources\Icon_XCI.png" />
|
<EmbeddedResource Include="Resources\Icon_XCI.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_Amiibo.png" />
|
<EmbeddedResource Include="Resources\Logo_Amiibo.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
|
<EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_Thiccjinx.png" />
|
<EmbeddedResource Include="Resources\Logo_Ryujinx_AntiAlias.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
|
<EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
|
<EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
|
||||||
<EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />
|
<EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />
|
||||||
|
|||||||
@@ -917,7 +917,7 @@ namespace Ryujinx.Ava
|
|||||||
|
|
||||||
if (ShouldInitMetal)
|
if (ShouldInitMetal)
|
||||||
{
|
{
|
||||||
#pragma warning disable CA1416 This call site is reachable on all platforms
|
#pragma warning disable CA1416 // This call site is reachable on all platforms
|
||||||
// The condition does a check for Mac, on top of checking if it's an ARM Mac. This isn't a problem.
|
// The condition does a check for Mac, on top of checking if it's an ARM Mac. This isn't a problem.
|
||||||
renderer = new MetalRenderer((RendererHost.EmbeddedWindow as EmbeddedWindowMetal)!.CreateSurface);
|
renderer = new MetalRenderer((RendererHost.EmbeddedWindow as EmbeddedWindowMetal)!.CreateSurface);
|
||||||
#pragma warning restore CA1416
|
#pragma warning restore CA1416
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ namespace Ryujinx.Ava.Common
|
|||||||
var cancellationToken = new CancellationTokenSource();
|
var cancellationToken = new CancellationTokenSource();
|
||||||
|
|
||||||
UpdateWaitWindow waitingDialog = new(
|
UpdateWaitWindow waitingDialog = new(
|
||||||
App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
||||||
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
|
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
|
||||||
cancellationToken);
|
cancellationToken);
|
||||||
|
|
||||||
@@ -268,10 +268,9 @@ namespace Ryujinx.Ava.Common
|
|||||||
{
|
{
|
||||||
Dispatcher.UIThread.Post(waitingDialog.Close);
|
Dispatcher.UIThread.Post(waitingDialog.Close);
|
||||||
|
|
||||||
NotificationHelper.Show(
|
NotificationHelper.ShowInformation(
|
||||||
App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
||||||
$"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}",
|
$"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
|
||||||
NotificationType.Information);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ namespace Ryujinx.Ava.Common.Locale
|
|||||||
{
|
{
|
||||||
_dynamicValues[key] = values;
|
_dynamicValues[key] = values;
|
||||||
|
|
||||||
OnPropertyChanged("Item");
|
OnPropertyChanged("Translation");
|
||||||
|
|
||||||
return this[key];
|
return this[key];
|
||||||
}
|
}
|
||||||
@@ -138,7 +138,7 @@ namespace Ryujinx.Ava.Common.Locale
|
|||||||
_localeStrings[key] = val;
|
_localeStrings[key] = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
OnPropertyChanged("Item");
|
OnPropertyChanged("Translation");
|
||||||
|
|
||||||
LocaleChanged?.Invoke();
|
LocaleChanged?.Invoke();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Common.Markup
|
|||||||
{
|
{
|
||||||
internal abstract class BasicMarkupExtension<T> : MarkupExtension
|
internal abstract class BasicMarkupExtension<T> : MarkupExtension
|
||||||
{
|
{
|
||||||
public virtual string Name => "Item";
|
public abstract string Name { get; }
|
||||||
public virtual Action<object, T?>? Setter => null;
|
public virtual Action<object, T?>? Setter => null;
|
||||||
|
|
||||||
protected abstract T? Value { get; }
|
protected abstract T? Value { get; }
|
||||||
|
|||||||
@@ -6,16 +6,19 @@ namespace Ryujinx.Ava.Common.Markup
|
|||||||
{
|
{
|
||||||
internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
|
internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
|
||||||
{
|
{
|
||||||
|
public override string Name => "Icon";
|
||||||
protected override Icon Value => new() { Value = iconString };
|
protected override Icon Value => new() { Value = iconString };
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
|
internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
|
||||||
{
|
{
|
||||||
|
public override string Name => "SIcon";
|
||||||
protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
|
protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
|
internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
|
||||||
{
|
{
|
||||||
|
public override string Name => "Translation";
|
||||||
protected override string Value => LocaleManager.Instance[key];
|
protected override string Value => LocaleManager.Instance[key];
|
||||||
|
|
||||||
protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension)
|
protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ namespace Ryujinx.Ava
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static AppBuilder BuildAvaloniaApp() =>
|
public static AppBuilder BuildAvaloniaApp() =>
|
||||||
AppBuilder.Configure<App>()
|
AppBuilder.Configure<RyujinxApp>()
|
||||||
.UsePlatformDetect()
|
.UsePlatformDetect()
|
||||||
.With(new X11PlatformOptions
|
.With(new X11PlatformOptions
|
||||||
{
|
{
|
||||||
@@ -100,7 +100,7 @@ namespace Ryujinx.Ava
|
|||||||
// Delete backup files after updating.
|
// Delete backup files after updating.
|
||||||
Task.Run(Updater.CleanupUpdate);
|
Task.Run(Updater.CleanupUpdate);
|
||||||
|
|
||||||
Console.Title = $"{App.FullAppName} Console {Version}";
|
Console.Title = $"{RyujinxApp.FullAppName} Console {Version}";
|
||||||
|
|
||||||
// Hook unhandled exception and process exit events.
|
// Hook unhandled exception and process exit events.
|
||||||
AppDomain.CurrentDomain.UnhandledException += (sender, e)
|
AppDomain.CurrentDomain.UnhandledException += (sender, e)
|
||||||
@@ -225,7 +225,7 @@ namespace Ryujinx.Ava
|
|||||||
|
|
||||||
private static void PrintSystemInfo()
|
private static void PrintSystemInfo()
|
||||||
{
|
{
|
||||||
Logger.Notice.Print(LogClass.Application, $"{App.FullAppName} Version: {Version}");
|
Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}");
|
||||||
SystemInfo.Gather().Print();
|
SystemInfo.Gather().Print();
|
||||||
|
|
||||||
var enabledLogLevels = Logger.GetEnabledLevels().ToArray();
|
var enabledLogLevels = Logger.GetEnabledLevels().ToArray();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<Application
|
<Application
|
||||||
x:Class="Ryujinx.Ava.App"
|
x:Class="Ryujinx.Ava.RyujinxApp"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:sty="using:FluentAvalonia.Styling">
|
xmlns:sty="using:FluentAvalonia.Styling">
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls.ApplicationLifetimes;
|
using Avalonia.Controls.ApplicationLifetimes;
|
||||||
|
using Avalonia.Input.Platform;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
using Avalonia.Platform;
|
using Avalonia.Platform;
|
||||||
using Avalonia.Styling;
|
using Avalonia.Styling;
|
||||||
@@ -19,7 +20,7 @@ using System.Diagnostics;
|
|||||||
|
|
||||||
namespace Ryujinx.Ava
|
namespace Ryujinx.Ava
|
||||||
{
|
{
|
||||||
public class App : Application
|
public class RyujinxApp : Application
|
||||||
{
|
{
|
||||||
internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
|
internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
|
||||||
=> windowTitleKey is null
|
=> windowTitleKey is null
|
||||||
@@ -32,6 +33,12 @@ namespace Ryujinx.Ava
|
|||||||
.ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
|
.ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
|
||||||
.MainWindow.Cast<MainWindow>();
|
.MainWindow.Cast<MainWindow>();
|
||||||
|
|
||||||
|
public static bool IsClipboardAvailable(out IClipboard clipboard)
|
||||||
|
{
|
||||||
|
clipboard = MainWindow.Clipboard;
|
||||||
|
return clipboard != null;
|
||||||
|
}
|
||||||
|
|
||||||
public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
|
public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
|
||||||
public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
|
public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
|
||||||
public static void SetTaskbarProgressValue(long current, long total) => SetTaskbarProgressValue(Convert.ToUInt64(current), Convert.ToUInt64(total));
|
public static void SetTaskbarProgressValue(long current, long total) => SetTaskbarProgressValue(Convert.ToUInt64(current), Convert.ToUInt64(total));
|
||||||
@@ -132,7 +139,7 @@ namespace Ryujinx.Ava
|
|||||||
};
|
};
|
||||||
|
|
||||||
public static ThemeVariant DetectSystemTheme() =>
|
public static ThemeVariant DetectSystemTheme() =>
|
||||||
Current is App { PlatformSettings: not null } app
|
Current is RyujinxApp { PlatformSettings: not null } app
|
||||||
? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
|
? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
|
||||||
: ThemeVariant.Default;
|
: ThemeVariant.Default;
|
||||||
}
|
}
|
||||||
@@ -101,11 +101,21 @@
|
|||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
Spacing="5">
|
Spacing="5">
|
||||||
<TextBlock
|
<Button
|
||||||
HorizontalAlignment="Stretch"
|
Click="IdString_OnClick"
|
||||||
Text="{Binding IdString}"
|
HorizontalContentAlignment="Left"
|
||||||
TextAlignment="Start"
|
VerticalAlignment="Center"
|
||||||
TextWrapping="Wrap" />
|
Background="{DynamicResource AppListBackgroundColor}"
|
||||||
|
Margin="-1, 0, 0, 0"
|
||||||
|
Padding="0" >
|
||||||
|
<TextBlock
|
||||||
|
Margin="1.5"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Text="{Binding IdString}"
|
||||||
|
Tag="{Binding Id}"
|
||||||
|
TextAlignment="Start"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</Button>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Text="{Binding FileExtension}"
|
Text="{Binding FileExtension}"
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Controls.Notifications;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
|
using FluentAvalonia.UI.Controls;
|
||||||
using Ryujinx.Ava.UI.Helpers;
|
using Ryujinx.Ava.UI.Helpers;
|
||||||
using Ryujinx.Ava.UI.ViewModels;
|
using Ryujinx.Ava.UI.ViewModels;
|
||||||
using Ryujinx.UI.App.Common;
|
using Ryujinx.UI.App.Common;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace Ryujinx.Ava.UI.Controls
|
namespace Ryujinx.Ava.UI.Controls
|
||||||
{
|
{
|
||||||
@@ -32,5 +35,27 @@ namespace Ryujinx.Ava.UI.Controls
|
|||||||
if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
|
if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
|
||||||
viewModel.ListSelectedApplication = selected;
|
viewModel.ListSelectedApplication = selected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void IdString_OnClick(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (DataContext is not MainWindowViewModel mwvm)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (sender is not Button { Content: TextBlock idText })
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!RyujinxApp.IsClipboardAvailable(out var clipboard))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
|
||||||
|
if (appData is null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
await clipboard.SetTextAsync(appData.IdString);
|
||||||
|
|
||||||
|
NotificationHelper.ShowInformation(
|
||||||
|
"Copied Title ID",
|
||||||
|
$"{appData.Name} ({appData.IdString})");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
19
src/Ryujinx/UI/Controls/StatusBarSeparator.cs
Normal file
19
src/Ryujinx/UI/Controls/StatusBarSeparator.cs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
using Avalonia;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Media;
|
||||||
|
|
||||||
|
namespace Ryujinx.Ava.UI.Controls
|
||||||
|
{
|
||||||
|
public class MiniVerticalSeparator : Border
|
||||||
|
{
|
||||||
|
public MiniVerticalSeparator()
|
||||||
|
{
|
||||||
|
Width = 2;
|
||||||
|
Height = 12;
|
||||||
|
Margin = new Thickness();
|
||||||
|
BorderBrush = Brushes.Gray;
|
||||||
|
Background = Brushes.Gray;
|
||||||
|
BorderThickness = new Thickness(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -62,9 +62,46 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
_notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
|
_notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ShowError(string message)
|
public static void ShowError(string message) =>
|
||||||
{
|
ShowError(
|
||||||
Show(LocaleManager.Instance[LocaleKeys.DialogErrorTitle], $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}", NotificationType.Error);
|
LocaleManager.Instance[LocaleKeys.DialogErrorTitle],
|
||||||
}
|
$"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}"
|
||||||
|
);
|
||||||
|
|
||||||
|
public static void ShowInformation(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
|
||||||
|
Show(
|
||||||
|
title,
|
||||||
|
text,
|
||||||
|
NotificationType.Information,
|
||||||
|
waitingExit,
|
||||||
|
onClick,
|
||||||
|
onClose);
|
||||||
|
|
||||||
|
public static void ShowSuccess(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
|
||||||
|
Show(
|
||||||
|
title,
|
||||||
|
text,
|
||||||
|
NotificationType.Success,
|
||||||
|
waitingExit,
|
||||||
|
onClick,
|
||||||
|
onClose);
|
||||||
|
|
||||||
|
public static void ShowWarning(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
|
||||||
|
Show(
|
||||||
|
title,
|
||||||
|
text,
|
||||||
|
NotificationType.Warning,
|
||||||
|
waitingExit,
|
||||||
|
onClick,
|
||||||
|
onClose);
|
||||||
|
|
||||||
|
public static void ShowError(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
|
||||||
|
Show(
|
||||||
|
title,
|
||||||
|
text,
|
||||||
|
NotificationType.Error,
|
||||||
|
waitingExit,
|
||||||
|
onClick,
|
||||||
|
onClose);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,11 +62,6 @@ namespace Ryujinx.Ava.UI.Renderer
|
|||||||
KnownGreatMetalTitles.ContainsIgnoreCase(titleId)
|
KnownGreatMetalTitles.ContainsIgnoreCase(titleId)
|
||||||
? new EmbeddedWindowMetal()
|
? new EmbeddedWindowMetal()
|
||||||
: new EmbeddedWindowVulkan();
|
: new EmbeddedWindowVulkan();
|
||||||
|
|
||||||
string backendText = EmbeddedWindow is EmbeddedWindowVulkan ? "Vulkan" : "Metal";
|
|
||||||
|
|
||||||
Logger.Info?.Print(LogClass.Gpu, $"Auto: Using {backendText}");
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case GraphicsBackend.OpenGl:
|
case GraphicsBackend.OpenGl:
|
||||||
EmbeddedWindow = new EmbeddedWindowOpenGL();
|
EmbeddedWindow = new EmbeddedWindowOpenGL();
|
||||||
@@ -78,6 +73,16 @@ namespace Ryujinx.Ava.UI.Renderer
|
|||||||
EmbeddedWindow = new EmbeddedWindowVulkan();
|
EmbeddedWindow = new EmbeddedWindowVulkan();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string backendText = EmbeddedWindow switch
|
||||||
|
{
|
||||||
|
EmbeddedWindowVulkan => "Vulkan",
|
||||||
|
EmbeddedWindowOpenGL => "OpenGL",
|
||||||
|
EmbeddedWindowMetal => "Metal",
|
||||||
|
_ => throw new NotImplementedException()
|
||||||
|
};
|
||||||
|
|
||||||
|
Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend ({ConfigurationState.Instance.Graphics.GraphicsBackend.Value}): {backendText}");
|
||||||
|
|
||||||
Initialize();
|
Initialize();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
public AboutWindowViewModel()
|
public AboutWindowViewModel()
|
||||||
{
|
{
|
||||||
Version = App.FullAppName + "\n" + Program.Version;
|
Version = RyujinxApp.FullAppName + "\n" + Program.Version;
|
||||||
UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
|
UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
|
||||||
|
|
||||||
ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
|
ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
|
||||||
@@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
private void UpdateLogoTheme(string theme)
|
private void UpdateLogoTheme(string theme)
|
||||||
{
|
{
|
||||||
bool isDarkTheme = theme == "Dark" || (theme == "Auto" && App.DetectSystemTheme() == ThemeVariant.Dark);
|
bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark);
|
||||||
|
|
||||||
string basePath = "resm:Ryujinx.UI.Common.Resources.";
|
string basePath = "resm:Ryujinx.UI.Common.Resources.";
|
||||||
string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";
|
string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
@@ -11,5 +12,13 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
{
|
{
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
|
||||||
|
{
|
||||||
|
foreach (var propertyName in propertyNames)
|
||||||
|
{
|
||||||
|
OnPropertyChanged(propertyName);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
// For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
|
// For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
|
||||||
// The border gets reduced to colored pixels in the 4 corners.
|
// The border gets reduced to colored pixels in the 4 corners.
|
||||||
public static readonly Bitmap IconBitmap =
|
public static readonly Bitmap IconBitmap =
|
||||||
new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png")!);
|
new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png")!);
|
||||||
|
|
||||||
public MainWindow Window { get; init; }
|
public MainWindow Window { get; init; }
|
||||||
|
|
||||||
@@ -2051,7 +2051,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
Dispatcher.UIThread.InvokeAsync(() =>
|
Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
Title = App.FormatTitle();
|
Title = RyujinxApp.FormatTitle();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,8 +71,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
{
|
{
|
||||||
_resolutionScale = value;
|
_resolutionScale = value;
|
||||||
|
|
||||||
OnPropertyChanged(nameof(CustomResolutionScale));
|
OnPropertiesChanged(nameof(CustomResolutionScale), nameof(IsCustomResolutionScaleActive));
|
||||||
OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,8 +180,9 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
int newInterval = (int)((value / 100f) * 60);
|
int newInterval = (int)((value / 100f) * 60);
|
||||||
_customVSyncInterval = newInterval;
|
_customVSyncInterval = newInterval;
|
||||||
_customVSyncIntervalPercentageProxy = value;
|
_customVSyncIntervalPercentageProxy = value;
|
||||||
OnPropertyChanged((nameof(CustomVSyncInterval)));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged((nameof(CustomVSyncIntervalPercentageText)));
|
nameof(CustomVSyncInterval),
|
||||||
|
nameof(CustomVSyncIntervalPercentageText));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
string text = CustomVSyncIntervalPercentageProxy.ToString() + "%";
|
string text = CustomVSyncIntervalPercentageProxy + "%";
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -221,8 +221,9 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
_customVSyncInterval = value;
|
_customVSyncInterval = value;
|
||||||
int newPercent = (int)((value / 60f) * 100);
|
int newPercent = (int)((value / 60f) * 100);
|
||||||
_customVSyncIntervalPercentageProxy = newPercent;
|
_customVSyncIntervalPercentageProxy = newPercent;
|
||||||
OnPropertyChanged(nameof(CustomVSyncIntervalPercentageProxy));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged(nameof(CustomVSyncIntervalPercentageText));
|
nameof(CustomVSyncIntervalPercentageProxy),
|
||||||
|
nameof(CustomVSyncIntervalPercentageText));
|
||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,39 +91,42 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
private void SortingChanged()
|
private void SortingChanged()
|
||||||
{
|
{
|
||||||
OnPropertyChanged(nameof(IsSortedByName));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged(nameof(IsSortedBySaved));
|
nameof(IsSortedByName),
|
||||||
OnPropertyChanged(nameof(SortingAscending));
|
nameof(IsSortedBySaved),
|
||||||
OnPropertyChanged(nameof(SortingField));
|
nameof(SortingAscending),
|
||||||
OnPropertyChanged(nameof(SortingFieldName));
|
nameof(SortingField),
|
||||||
|
nameof(SortingFieldName));
|
||||||
|
|
||||||
SortAndFilter();
|
SortAndFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DisplayedChanged()
|
private void DisplayedChanged()
|
||||||
{
|
{
|
||||||
OnPropertyChanged(nameof(Status));
|
OnPropertiesChanged(nameof(Status), nameof(DisplayedXCIFiles), nameof(SelectedDisplayedXCIFiles));
|
||||||
OnPropertyChanged(nameof(DisplayedXCIFiles));
|
|
||||||
OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ApplicationsChanged()
|
private void ApplicationsChanged()
|
||||||
{
|
{
|
||||||
OnPropertyChanged(nameof(AllXCIFiles));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged(nameof(Status));
|
nameof(AllXCIFiles),
|
||||||
OnPropertyChanged(nameof(PotentialSavings));
|
nameof(Status),
|
||||||
OnPropertyChanged(nameof(ActualSavings));
|
nameof(PotentialSavings),
|
||||||
OnPropertyChanged(nameof(CanTrim));
|
nameof(ActualSavings),
|
||||||
OnPropertyChanged(nameof(CanUntrim));
|
nameof(CanTrim),
|
||||||
|
nameof(CanUntrim));
|
||||||
|
|
||||||
DisplayedChanged();
|
DisplayedChanged();
|
||||||
SortAndFilter();
|
SortAndFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SelectionChanged(bool displayedChanged = true)
|
private void SelectionChanged(bool displayedChanged = true)
|
||||||
{
|
{
|
||||||
OnPropertyChanged(nameof(Status));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged(nameof(CanTrim));
|
nameof(Status),
|
||||||
OnPropertyChanged(nameof(CanUntrim));
|
nameof(CanTrim),
|
||||||
OnPropertyChanged(nameof(SelectedXCIFiles));
|
nameof(CanUntrim),
|
||||||
|
nameof(SelectedXCIFiles));
|
||||||
|
|
||||||
if (displayedChanged)
|
if (displayedChanged)
|
||||||
OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
|
OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
|
||||||
@@ -131,11 +134,12 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
private void ProcessingChanged()
|
private void ProcessingChanged()
|
||||||
{
|
{
|
||||||
OnPropertyChanged(nameof(Processing));
|
OnPropertiesChanged(
|
||||||
OnPropertyChanged(nameof(Cancel));
|
nameof(Processing),
|
||||||
OnPropertyChanged(nameof(Status));
|
nameof(Cancel),
|
||||||
OnPropertyChanged(nameof(CanTrim));
|
nameof(Status),
|
||||||
OnPropertyChanged(nameof(CanUntrim));
|
nameof(CanTrim),
|
||||||
|
nameof(CanUntrim));
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<XCITrimmerFileModel> GetSelectedDisplayedXCIFiles()
|
private IEnumerable<XCITrimmerFileModel> GetSelectedDisplayedXCIFiles()
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
Height="25"
|
Height="25"
|
||||||
Width="25"
|
Width="25"
|
||||||
ToolTip.Tip="{Binding Title}"
|
ToolTip.Tip="{Binding Title}"
|
||||||
Source="resm:Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png?assembly=Ryujinx.UI.Common" />
|
Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png?assembly=Ryujinx.UI.Common" />
|
||||||
<Menu
|
<Menu
|
||||||
Name="Menu"
|
Name="Menu"
|
||||||
Height="32"
|
Height="32"
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
|
xmlns:local="clr-namespace:Ryujinx.Ava.UI.Views.Main"
|
||||||
xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
|
xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
|
||||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||||
x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
|
x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
|
||||||
@@ -132,14 +133,7 @@
|
|||||||
</Flyout>
|
</Flyout>
|
||||||
</Button.Flyout>
|
</Button.Flyout>
|
||||||
</Button>
|
</Button>
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Name="DockedStatus"
|
Name="DockedStatus"
|
||||||
Margin="5,0,5,0"
|
Margin="5,0,5,0"
|
||||||
@@ -149,14 +143,7 @@
|
|||||||
PointerReleased="DockedStatus_PointerReleased"
|
PointerReleased="DockedStatus_PointerReleased"
|
||||||
Text="{Binding DockedStatusText}"
|
Text="{Binding DockedStatusText}"
|
||||||
TextAlignment="Start" />
|
TextAlignment="Start" />
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<SplitButton
|
<SplitButton
|
||||||
Name="AspectRatioStatus"
|
Name="AspectRatioStatus"
|
||||||
Padding="5,0,5,0"
|
Padding="5,0,5,0"
|
||||||
@@ -203,14 +190,7 @@
|
|||||||
</MenuFlyout>
|
</MenuFlyout>
|
||||||
</SplitButton.Flyout>
|
</SplitButton.Flyout>
|
||||||
</SplitButton>
|
</SplitButton>
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<ToggleSplitButton
|
<ToggleSplitButton
|
||||||
Name="VolumeStatus"
|
Name="VolumeStatus"
|
||||||
Padding="5,0,5,0"
|
Padding="5,0,5,0"
|
||||||
@@ -254,14 +234,7 @@
|
|||||||
</Flyout>
|
</Flyout>
|
||||||
</ToggleSplitButton.Flyout>
|
</ToggleSplitButton.Flyout>
|
||||||
</ToggleSplitButton>
|
</ToggleSplitButton>
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,5,0"
|
Margin="5,0,5,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
@@ -269,14 +242,7 @@
|
|||||||
IsVisible="{Binding !ShowLoadProgress}"
|
IsVisible="{Binding !ShowLoadProgress}"
|
||||||
Text="{Binding GameStatusText}"
|
Text="{Binding GameStatusText}"
|
||||||
TextAlignment="Start" />
|
TextAlignment="Start" />
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,5,0"
|
Margin="5,0,5,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
@@ -298,13 +264,7 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
IsVisible="{Binding ShowShaderCompilationHint}"
|
IsVisible="{Binding ShowShaderCompilationHint}"
|
||||||
Text="{Binding ShaderCountText}" />
|
Text="{Binding ShaderCountText}" />
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding ShowShaderCompilationHint}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,5,0"
|
Margin="5,0,5,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
@@ -312,14 +272,7 @@
|
|||||||
IsVisible="{Binding !ShowLoadProgress}"
|
IsVisible="{Binding !ShowLoadProgress}"
|
||||||
Text="{Binding BackendText}"
|
Text="{Binding BackendText}"
|
||||||
TextAlignment="Start" />
|
TextAlignment="Start" />
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
Background="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding !ShowLoadProgress}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="5,0,0,0"
|
Margin="5,0,0,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
@@ -334,13 +287,7 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
IsVisible="{Binding ShowFirmwareStatus}"
|
IsVisible="{Binding ShowFirmwareStatus}"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Border
|
<controls:MiniVerticalSeparator IsVisible="{Binding IsGameRunning}" />
|
||||||
Width="2"
|
|
||||||
Height="12"
|
|
||||||
Margin="0"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
IsVisible="{Binding IsGameRunning}" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Name="FirmwareStatus"
|
Name="FirmwareStatus"
|
||||||
Margin="5, 0, 0, 0"
|
Margin="5, 0, 0, 0"
|
||||||
|
|||||||
@@ -62,12 +62,7 @@ namespace Ryujinx.Ava.UI.Views.Main
|
|||||||
// Change the volume by 5% at a time
|
// Change the volume by 5% at a time
|
||||||
float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
|
float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
|
||||||
|
|
||||||
Window.ViewModel.Volume = newValue switch
|
Window.ViewModel.Volume = Math.Clamp(newValue, 0, 1);
|
||||||
{
|
|
||||||
< 0 => 0,
|
|
||||||
> 1 => 1,
|
|
||||||
_ => newValue,
|
|
||||||
};
|
|
||||||
|
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
Title = App.FormatTitle(LocaleKeys.Amiibo);
|
Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
|
||||||
}
|
}
|
||||||
|
|
||||||
public AmiiboWindow()
|
public AmiiboWindow()
|
||||||
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
if (Program.PreviewerDetached)
|
if (Program.PreviewerDetached)
|
||||||
{
|
{
|
||||||
Title = App.FormatTitle(LocaleKeys.Amiibo);
|
Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
|
Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
|
public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
|
||||||
@@ -93,7 +93,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
DataContext = this;
|
DataContext = this;
|
||||||
|
|
||||||
Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
|
Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Save()
|
public void Save()
|
||||||
|
|||||||
@@ -86,17 +86,22 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
UiHandler = new AvaHostUIHandler(this);
|
UiHandler = new AvaHostUIHandler(this);
|
||||||
|
|
||||||
ViewModel.Title = App.FormatTitle();
|
ViewModel.Title = RyujinxApp.FormatTitle();
|
||||||
|
|
||||||
TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
|
TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
|
||||||
TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
|
TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
|
||||||
|
|
||||||
// Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
|
|
||||||
TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
|
|
||||||
|
|
||||||
// NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
|
// NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
|
||||||
StatusBarHeight = StatusBarView.StatusBar.MinHeight;
|
StatusBarHeight = StatusBarView.StatusBar.MinHeight;
|
||||||
MenuBarHeight = MenuBar.MinHeight;
|
MenuBarHeight = MenuBar.MinHeight;
|
||||||
|
|
||||||
|
TitleBar.Height = MenuBarHeight;
|
||||||
|
|
||||||
|
// Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
|
||||||
|
TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
|
||||||
|
|
||||||
|
ApplicationList.DataContext = DataContext;
|
||||||
|
ApplicationGrid.DataContext = DataContext;
|
||||||
|
|
||||||
SetWindowSizePosition();
|
SetWindowSizePosition();
|
||||||
|
|
||||||
@@ -114,7 +119,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private static void OnPlatformColorValuesChanged(object sender, PlatformColorValues e)
|
private static void OnPlatformColorValuesChanged(object sender, PlatformColorValues e)
|
||||||
{
|
{
|
||||||
if (Application.Current is App app)
|
if (Application.Current is RyujinxApp app)
|
||||||
app.ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
|
app.ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
|
|
||||||
public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
|
public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
|
||||||
{
|
{
|
||||||
Title = App.FormatTitle(LocaleKeys.Settings);
|
Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
|
||||||
|
|
||||||
DataContext = ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);
|
DataContext = ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ namespace Ryujinx.Ava
|
|||||||
|
|
||||||
if (!Version.TryParse(Program.Version, out Version currentVersion))
|
if (!Version.TryParse(Program.Version, out Version currentVersion))
|
||||||
{
|
{
|
||||||
Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {App.FullAppName} version!");
|
Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");
|
||||||
|
|
||||||
await ContentDialogHelper.CreateWarningDialog(
|
await ContentDialogHelper.CreateWarningDialog(
|
||||||
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
|
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
|
||||||
@@ -159,7 +159,7 @@ namespace Ryujinx.Ava
|
|||||||
|
|
||||||
if (!Version.TryParse(_buildVer, out Version newVersion))
|
if (!Version.TryParse(_buildVer, out Version newVersion))
|
||||||
{
|
{
|
||||||
Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {App.FullAppName} version from GitHub!");
|
Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {RyujinxApp.FullAppName} version from GitHub!");
|
||||||
|
|
||||||
await ContentDialogHelper.CreateWarningDialog(
|
await ContentDialogHelper.CreateWarningDialog(
|
||||||
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
|
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
|
||||||
@@ -266,7 +266,7 @@ namespace Ryujinx.Ava
|
|||||||
SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
|
SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
|
||||||
IconSource = new SymbolIconSource { Symbol = Symbol.Download },
|
IconSource = new SymbolIconSource { Symbol = Symbol.Download },
|
||||||
ShowProgressBar = true,
|
ShowProgressBar = true,
|
||||||
XamlRoot = App.MainWindow,
|
XamlRoot = RyujinxApp.MainWindow,
|
||||||
};
|
};
|
||||||
|
|
||||||
taskDialog.Opened += (s, e) =>
|
taskDialog.Opened += (s, e) =>
|
||||||
@@ -490,7 +490,7 @@ namespace Ryujinx.Ava
|
|||||||
bytesWritten += readSize;
|
bytesWritten += readSize;
|
||||||
|
|
||||||
taskDialog.SetProgressBarState(GetPercentage(bytesWritten, totalBytes), TaskDialogProgressState.Normal);
|
taskDialog.SetProgressBarState(GetPercentage(bytesWritten, totalBytes), TaskDialogProgressState.Normal);
|
||||||
App.SetTaskbarProgressValue(bytesWritten, totalBytes);
|
RyujinxApp.SetTaskbarProgressValue(bytesWritten, totalBytes);
|
||||||
|
|
||||||
updateFileStream.Write(buffer, 0, readSize);
|
updateFileStream.Write(buffer, 0, readSize);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user