mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-27 16:01:21 -08:00
934b5a64e5
* Fix redundancies * Add back elses * Loading Screen fixes * Redesign User Profile Manager - Backported long selection bar in Grid/List view not working - Backported UserSelector is jank * Fix SelectionIndicator * Fix DataType * Fix SaveManager bug * Remove debug log * Load saves on UIThread * Reduce UI thread blocking * Fix locale keys * Use block namespaces * Fix close button width * Make UserProfile ordering consistent * Alphabetical order * Adjust layout, remove green circle for blue selector * Fix some inconsistencies * Fix no inital selected profile * Adjust appearance of edit button * Adjust SaveManager * Remove redundant warning dialog * Make firmware avatar selector clearer * View redesign again :hero_depressed: * Consistency adjustments * Adjust margins * Make `UserProfileImageSelector` consistent * Make `UserFirmwareAvatarSelector` consistent * Fix long grid view selector * Switch case * Remove long selection bar Handled in #4178 * Consistency * Started dialog titles * Fixes * Remaining titles * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml Co-authored-by: Mary-nyan <thog@protonmail.com> * Fix build * Hide UserRecoverer if no LostProfiles are found * UserEditor Avatar Placeholder * Watermark + locale adjustment * Border radius * Remove unnecessary styles * Fix firmware avatar image order * Cleanup `ColorPickerButton` * Make `UserId` copy/paste able * Make `FirmwareAvatarSelector` 6 images wide * Make selection bar better * Unsaved changes dialogue * Fix indentation * Remove extra check * Address suggestions * Reorganise - Remove unused views - Rename views to match convention - Fix weird namespacing * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * UserRecovererView empty placeholder * Update Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/UserProfile.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Remove AddModel * Update Ryujinx.Ava/Assets/Locales/en_US.json Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix bug Co-authored-by: Mary-nyan <thog@protonmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>
127 lines
4.2 KiB
C#
127 lines
4.2 KiB
C#
using System;
|
|
using System.Runtime.Versioning;
|
|
using System.Runtime.InteropServices;
|
|
using Avalonia;
|
|
|
|
namespace Ryujinx.Ava.UI.Helpers
|
|
{
|
|
public delegate void UpdateBoundsCallbackDelegate(Rect rect);
|
|
|
|
[SupportedOSPlatform("macos")]
|
|
static partial class MetalHelper
|
|
{
|
|
private const string LibObjCImport = "/usr/lib/libobjc.A.dylib";
|
|
|
|
private struct Selector
|
|
{
|
|
public readonly IntPtr NativePtr;
|
|
|
|
public unsafe Selector(string value)
|
|
{
|
|
int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
|
|
byte* data = stackalloc byte[size];
|
|
|
|
fixed (char* pValue = value)
|
|
{
|
|
System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
|
|
}
|
|
|
|
NativePtr = sel_registerName(data);
|
|
}
|
|
|
|
public static implicit operator Selector(string value) => new Selector(value);
|
|
}
|
|
|
|
private static unsafe IntPtr GetClass(string value)
|
|
{
|
|
int size = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
|
|
byte* data = stackalloc byte[size];
|
|
|
|
fixed (char* pValue = value)
|
|
{
|
|
System.Text.Encoding.UTF8.GetBytes(pValue, value.Length, data, size);
|
|
}
|
|
|
|
return objc_getClass(data);
|
|
}
|
|
|
|
private struct NSPoint
|
|
{
|
|
public double X;
|
|
public double Y;
|
|
|
|
public NSPoint(double x, double y)
|
|
{
|
|
X = x;
|
|
Y = y;
|
|
}
|
|
}
|
|
|
|
private struct NSRect
|
|
{
|
|
public NSPoint Pos;
|
|
public NSPoint Size;
|
|
|
|
public NSRect(double x, double y, double width, double height)
|
|
{
|
|
Pos = new NSPoint(x, y);
|
|
Size = new NSPoint(width, height);
|
|
}
|
|
}
|
|
|
|
public static IntPtr GetMetalLayer(out IntPtr nsView, out UpdateBoundsCallbackDelegate updateBounds)
|
|
{
|
|
// Create a new CAMetalLayer.
|
|
IntPtr layerClass = GetClass("CAMetalLayer");
|
|
IntPtr metalLayer = IntPtr_objc_msgSend(layerClass, "alloc");
|
|
objc_msgSend(metalLayer, "init");
|
|
|
|
// Create a child NSView to render into.
|
|
IntPtr nsViewClass = GetClass("NSView");
|
|
IntPtr child = IntPtr_objc_msgSend(nsViewClass, "alloc");
|
|
objc_msgSend(child, "init", new NSRect(0, 0, 0, 0));
|
|
|
|
// Make its renderer our metal layer.
|
|
objc_msgSend(child, "setWantsLayer:", (byte)1);
|
|
objc_msgSend(child, "setLayer:", metalLayer);
|
|
objc_msgSend(metalLayer, "setContentsScale:", Program.DesktopScaleFactor);
|
|
|
|
// Ensure the scale factor is up to date.
|
|
updateBounds = (Rect rect) => {
|
|
objc_msgSend(metalLayer, "setContentsScale:", Program.DesktopScaleFactor);
|
|
};
|
|
|
|
nsView = child;
|
|
return metalLayer;
|
|
}
|
|
|
|
public static void DestroyMetalLayer(IntPtr nsView, IntPtr metalLayer)
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static unsafe partial IntPtr sel_registerName(byte* data);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static unsafe partial IntPtr objc_getClass(byte* data);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static partial void objc_msgSend(IntPtr receiver, Selector selector);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
|
|
|
|
[LibraryImport(LibObjCImport)]
|
|
private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
|
|
|
|
[LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")]
|
|
private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
|
|
}
|
|
} |