diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2022-12-06 22:00:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 19:00:25 -0300 |
| commit | e211c3f00a847f50b286349918e5c51967862e93 (patch) | |
| tree | 5c703923741ee42362c86fef3981bdf745f881a4 /Ryujinx.HLE | |
| parent | d3709a753f88e6b02d6a1760835227a7fdcc5a19 (diff) | |
UI: Add Metal surface creation for MoltenVK (#3980)
* Initial implementation of metal surface across UIs
* Fix SDL2 on windows
* Update Ryujinx/Ryujinx.csproj
Co-authored-by: Mary-nyan <thog@protonmail.com>
* Address Feedback
Co-authored-by: Mary-nyan <thog@protonmail.com>
Diffstat (limited to 'Ryujinx.HLE')
| -rw-r--r-- | Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/Resources/Logo_Ryujinx.png | bin | 0 -> 52972 bytes | |||
| -rw-r--r-- | Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs | 8 | ||||
| -rw-r--r-- | Ryujinx.HLE/Ryujinx.HLE.csproj | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/Resources/Logo_Ryujinx.png b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/Resources/Logo_Ryujinx.png Binary files differnew file mode 100644 index 00000000..0e8da15e --- /dev/null +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/Resources/Logo_Ryujinx.png diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs index 6c0955ec..8216a65e 100644 --- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs +++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs @@ -11,7 +11,6 @@ using System.Numerics; using System.Reflection; using System.Runtime.InteropServices; using SixLabors.ImageSharp.PixelFormats; -using Ryujinx.Common; namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard { @@ -68,8 +67,8 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard { int ryujinxLogoSize = 32; - Stream logoStream = EmbeddedResources.GetStream("Ryujinx.Ui.Common/Resources/Logo_Ryujinx.png"); - _ryujinxLogo = LoadResource(logoStream, ryujinxLogoSize, ryujinxLogoSize); + string ryujinxIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Logo_Ryujinx.png"; + _ryujinxLogo = LoadResource(Assembly.GetExecutingAssembly(), ryujinxIconPath, ryujinxLogoSize, ryujinxLogoSize); string padAcceptIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Icon_BtnA.png"; string padCancelIconPath = "Ryujinx.HLE.HOS.Applets.SoftwareKeyboard.Resources.Icon_BtnB.png"; @@ -117,7 +116,8 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard uiThemeFontFamily, "Liberation Sans", "FreeSans", - "DejaVu Sans" + "DejaVu Sans", + "Lucida Grande" }; foreach (string fontFamily in availableFonts) diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj index 82f3483c..ec5d2680 100644 --- a/Ryujinx.HLE/Ryujinx.HLE.csproj +++ b/Ryujinx.HLE/Ryujinx.HLE.csproj @@ -36,6 +36,7 @@ <ItemGroup> <None Remove="Homebrew.npdm" /> + <None Remove="HOS\Applets\SoftwareKeyboard\Resources\Logo_Ryujinx.png" /> <None Remove="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnA.png" /> <None Remove="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" /> <None Remove="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" /> @@ -44,6 +45,7 @@ <ItemGroup> <EmbeddedResource Include="Homebrew.npdm" /> + <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Logo_Ryujinx.png" /> <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnA.png" /> <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" /> <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" /> |
