MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Merge branch 'GreemDev:master' into master

Browse Source
This commit is contained in:
Vladimir Sokolov 2024-11-25 09:10:46 +10:00 committed by GitHub
commit a158a93d0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Ryujinx.UI.Common/DiscordIntegrationModule.cs
View File

@ -264,6 +264,7 @@ namespace Ryujinx.UI.Common
"0100800015926000", // Suika Game "0100800015926000", // Suika Game
"0100e46006708000", // Terraria "0100e46006708000", // Terraria
"01000a10041ea000", // The Elder Scrolls V: Skyrim "01000a10041ea000", // The Elder Scrolls V: Skyrim
"010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
"010080b00ad66000", // Undertale "010080b00ad66000", // Undertale
]; ];
} }

5
src/Ryujinx/Assets/Styles/Styles.xaml
View File

@ -1,7 +1,8 @@
<Styles <Styles
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:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"> xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
<Design.PreviewWith> <Design.PreviewWith>
<Border Height="2000" <Border Height="2000"
Padding="20"> Padding="20">
@ -231,7 +232,7 @@
<Setter Property="BorderBrush" <Setter Property="BorderBrush"
Value="{DynamicResource HighlightBrush}" /> Value="{DynamicResource HighlightBrush}" />
</Style> </Style>
<Style Selector="Button"> <Style Selector="Button:not(windowing|MinMaxCloseControl Button)">
<Setter Property="MinWidth" <Setter Property="MinWidth"
Value="80" /> Value="80" />
</Style> </Style>

6
src/Ryujinx/UI/Windows/AboutWindow.axaml
View File

@ -6,8 +6,10 @@
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup" xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels"
Width="550" MinWidth="550"
Height="260" MinHeight="260"
MaxWidth="600"
MaxHeight="500"
Margin="0,-12,0,0" Margin="0,-12,0,0"
d:DesignHeight="260" d:DesignHeight="260"
d:DesignWidth="550" d:DesignWidth="550"