crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-04-24 06:47:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

UI: Inline game/autoload dir & motion/rumble/led

Browse source
This commit is contained in:
Evan Husted 2025-03-06 04:12:34 -06:00
parent 0db85d0aa9
commit bda699f68e
4 changed files with 293 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/Ryujinx/UI/Controls/StatusBarSeparator.cs → src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
View file

56
src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
View file

@ -4,10 +4,10 @@
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup" xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls" xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
xmlns:pt="using:Projektanker.Icons.Avalonia"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
d:DesignHeight="800" d:DesignHeight="800"
@ -507,65 +507,49 @@
CornerRadius="5" CornerRadius="5"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<Grid ColumnDefinitions="*,Auto"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel Orientation="Vertical" Spacing="5">
<CheckBox <CheckBox
Margin="10" Margin="10, 10, 10, 0"
MinWidth="0" MinWidth="0"
Grid.Column="0"
IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}"> IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
<TextBlock Text="{ext:Locale ControllerSettingsMotion}" /> <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
</CheckBox> </CheckBox>
<Button <Button
Margin="10" Margin="10, 0, 10, 10"
Grid.Column="1"
Command="{Binding ShowMotionConfig}"> Command="{Binding ShowMotionConfig}">
<TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" /> <pt:Icon Value="fa-solid fa-gear" />
</Button> </Button>
</Grid> </StackPanel>
</Border> <controls:MiniVerticalSeparator Height="64"/>
<Border <StackPanel Orientation="Vertical" Spacing="5">
BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1"
CornerRadius="5"
HorizontalAlignment="Stretch"
Margin="0,-1,0,0">
<Grid ColumnDefinitions="*,Auto">
<CheckBox <CheckBox
Margin="10" Margin="10, 10, 10, 0"
MinWidth="0" MinWidth="0"
Grid.Column="0"
IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}"> IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
<TextBlock Text="{ext:Locale ControllerSettingsRumble}" /> <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
</CheckBox> </CheckBox>
<Button <Button
Margin="10" Margin="10, 0, 10, 10"
Grid.Column="1"
Command="{Binding ShowRumbleConfig}"> Command="{Binding ShowRumbleConfig}">
<TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" /> <pt:Icon Value="fa-solid fa-gear" />
</Button> </Button>
</Grid> </StackPanel>
</Border> <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
<Border <StackPanel Orientation="Vertical" Spacing="5">
BorderBrush="{DynamicResource ThemeControlBorderColor}"
BorderThickness="1"
CornerRadius="5"
HorizontalAlignment="Stretch"
Margin="0,-1,0,0">
<Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
<CheckBox <CheckBox
Margin="10, 10, 5, 10" Margin="10, 10, 10, 0"
MinWidth="0" MinWidth="0"
Grid.Column="0"
IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}"> IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
<TextBlock Text="{ext:Locale ControllerSettingsLed}" /> <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
</CheckBox> </CheckBox>
<Button <Button
Margin="10" Margin="10, 0, 10, 10"
Grid.Column="1"
Command="{Binding ShowLedConfig}"> Command="{Binding ShowLedConfig}">
<TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" /> <pt:Icon Value="fa-solid fa-gear" />
</Button> </Button>
</Grid> </StackPanel>
</StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

28
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View file

@ -6,7 +6,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup" xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
mc:Ignorable="d" mc:Ignorable="d"
x:DataType="viewModels:SettingsViewModel"> x:DataType="viewModels:SettingsViewModel">
<Design.DataContext> <Design.DataContext>
@ -19,7 +18,9 @@
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"> VerticalScrollBarVisibility="Auto">
<Border Classes="settings"> <Border Classes="settings">
<Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
<StackPanel <StackPanel
Grid.Column="0"
Margin="10" Margin="10"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Orientation="Vertical" Orientation="Vertical"
@ -80,7 +81,8 @@
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" /> <TextBlock
Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
@ -102,7 +104,8 @@
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" /> <TextBlock
Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
@ -155,7 +158,20 @@
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Separator Height="1" /> </StackPanel>
<Border Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Margin="10, 10, 10, 0"
Height="405"
BorderBrush="Gray"
Background="Gray"
Width="1" />
<StackPanel
Margin="10"
Spacing="10"
Grid.Column="2"
Orientation="Vertical" HorizontalAlignment="Stretch">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" /> <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
@ -211,7 +227,8 @@
<TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" /> <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel> </StackPanel>
<TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" /> <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
</StackPanel> </StackPanel>
<StackPanel <StackPanel
IsEnabled="{Binding !IsGameTitleNotNull}" IsEnabled="{Binding !IsGameTitleNotNull}"
@ -259,6 +276,7 @@
</Grid> </Grid>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid>
</Border> </Border>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>

4
src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
View file

@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
: NavigationViewPaneDisplayMode.Top; : NavigationViewPaneDisplayMode.Top;
Height = ConfigurationState.Instance.ShowOldUI Height = ConfigurationState.Instance.ShowOldUI
? 927 ? 906
: 993; // nav panel is put on top with custom title bar so account for new height : 954; // nav panel is put on top with custom title bar so account for new height
Load(); Load();
} }