Merge 8db5a7e98b into f8c53f03fd

UI: Fix logo aliasing
Try and fix weird nullref
2024-12-21 11:26:33 +01:00 · 2024-12-18 03:20:55 +00:00 · 2024-12-17 21:20:49 -06:00 · 2024-11-19 10:32:51 -06:00
4 changed files with 7 additions and 6 deletions
--- a/src/Ryujinx.UI.Common/Resources/Logo_Thiccjinx.png
+++ b/src/Ryujinx.UI.Common/Resources/Logo_Thiccjinx.png
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@ -34,6 +34,7 @@
    <EmbeddedResource Include="Resources\Icon_XCI.png" />
    <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
    <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
+    <EmbeddedResource Include="Resources\Logo_Thiccjinx.png" />
    <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
    <EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
    <EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@ -125,7 +125,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        public IEnumerable<LdnGameData> LastLdnGameData;

        public static readonly Bitmap IconBitmap =
-            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Ryujinx.png")!);
+            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png")!);

        public MainWindow Window { get; init; }

--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@ -14,14 +14,14 @@
    <DockPanel HorizontalAlignment="Stretch">
        <Image
            Name="RyuLogo"
-            Margin="2, 1,-1, 0"
-            Height="36"
-            Width="36"
+            Margin="7, 0"
+            Height="25"
+            Width="25"
            ToolTip.Tip="{Binding Title}"
-            Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.UI.Common" />
+            Source="resm:Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png?assembly=Ryujinx.UI.Common" />
        <Menu
            Name="Menu"
-            Height="35"
+            Height="32"
            Margin="0"
            HorizontalAlignment="Left"
            IsOpen="{Binding IsSubMenuOpen, Mode=OneWayToSource}">
Author	SHA1	Message	Date
Evan Husted	176d9c716a	Merge `8db5a7e98b` into `f8c53f03fd`	2024-12-18 03:20:55 +00:00
Evan Husted	8db5a7e98b	UI: Fix logo aliasing Some checks failed Canary release job / Create tag (push) Has been cancelled Details Canary release job / Release for linux-arm64 (push) Has been cancelled Details Canary release job / Release for linux-x64 (push) Has been cancelled Details Canary release job / Release for win-x64 (push) Has been cancelled Details Canary release job / Release MacOS universal (push) Has been cancelled Details	2024-12-17 21:20:49 -06:00
Evan Husted	f8c53f03fd	Try and fix weird nullref Some checks failed Release job / Create tag (push) Has been cancelled Details Release job / Release for linux-arm64 (push) Has been cancelled Details Release job / Release for linux-x64 (push) Has been cancelled Details Release job / Release for win-x64 (push) Has been cancelled Details Release job / Release MacOS universal (push) Has been cancelled Details	2024-11-19 10:32:51 -06:00