emu-mirrors/Ryujinx
0
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2024-12-22 23:55:47 +00:00
Code Wiki Activity

Merge branch 'GreemDev:master' into master

Browse source
This commit is contained in:
Daniel Nylander 2024-12-18 13:42:09 +01:00 committed by GitHub
commit 150fa05db1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/Ryujinx.UI.Common/Resources/Logo_Thiccjinx.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 609 KiB

1
src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
View file

@ -34,6 +34,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_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" />

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -125,7 +125,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public IEnumerable<LdnGameData> LastLdnGameData; public IEnumerable<LdnGameData> LastLdnGameData;
public static readonly Bitmap IconBitmap = 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; } public MainWindow Window { get; init; }

10
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
View file

@ -14,14 +14,14 @@
<DockPanel HorizontalAlignment="Stretch"> <DockPanel HorizontalAlignment="Stretch">
<Image <Image
Name="RyuLogo" Name="RyuLogo"
Margin="2, 1,-1, 0" Margin="7, 0"
Height="36" Height="25"
Width="36" Width="25"
ToolTip.Tip="{Binding Title}" 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 <Menu
Name="Menu" Name="Menu"
Height="35" Height="32"
Margin="0" Margin="0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsOpen="{Binding IsSubMenuOpen, Mode=OneWayToSource}"> IsOpen="{Binding IsSubMenuOpen, Mode=OneWayToSource}">