Compare commits

..

3 Commits

Author SHA1 Message Date
Evan Husted
359852b5c0 UI: Change order of VSync mode changing
VSync -> VSync Off -> Custom
is now
VSync -> Custom -> VSync Off

Note that Custom only appears if it's enabled in settings. This has no change if you aren't using custom VSync.
2025-01-30 16:47:40 -06:00
Evan Husted
796674d9cf UI: Allow more freedom changing the Speed value & clamp the visible number to a sane amount of trailing digits 2025-01-30 03:30:50 -06:00
Evan Husted
4efe24a3bc misc: chore: [ci skip] forgot to make that a locale entry 2025-01-30 03:21:42 -06:00
5 changed files with 34 additions and 16 deletions

View File

@@ -325,21 +325,15 @@ namespace Ryujinx.Ava
switch (oldVSyncMode) switch (oldVSyncMode)
{ {
case VSyncMode.Switch: case VSyncMode.Switch:
newVSyncMode = VSyncMode.Unbounded; newVSyncMode = customVSyncIntervalEnabled
? VSyncMode.Custom
: VSyncMode.Unbounded;
break; break;
case VSyncMode.Unbounded: case VSyncMode.Unbounded:
if (customVSyncIntervalEnabled)
{
newVSyncMode = VSyncMode.Custom;
}
else
{
newVSyncMode = VSyncMode.Switch; newVSyncMode = VSyncMode.Switch;
}
break; break;
case VSyncMode.Custom: case VSyncMode.Custom:
newVSyncMode = VSyncMode.Switch; newVSyncMode = VSyncMode.Unbounded;
break; break;
} }

View File

@@ -7747,6 +7747,31 @@
"zh_TW": "" "zh_TW": ""
} }
}, },
{
"ID": "ControllerSettingsLedColorRainbowSpeed",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Rainbow Speed",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{ {
"ID": "ControllerSettingsLedColor", "ID": "ControllerSettingsLedColor",
"Translations": { "Translations": {

View File

@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
[ObservableProperty] private bool _enableLedChanging; [ObservableProperty] private bool _enableLedChanging;
[ObservableProperty] private Color _ledColor; [ObservableProperty] private Color _ledColor;
public string RainbowSpeedText => RainbowSpeed.ToString(CultureInfo.CurrentCulture); public string RainbowSpeedText => RainbowSpeed.ToString(CultureInfo.CurrentCulture).Truncate(4, string.Empty);
public float RainbowSpeed public float RainbowSpeed
{ {

View File

@@ -28,7 +28,7 @@
</CheckBox> </CheckBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsEnabled="{Binding !TurnOffLed}"> <StackPanel Orientation="Horizontal" IsEnabled="{Binding !TurnOffLed}">
<TextBlock MinWidth="75" MaxWidth="200" Text="Rainbow Speed" /> <TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" />
<Slider HorizontalAlignment="Center" <Slider HorizontalAlignment="Center"
Value="{Binding RainbowSpeed}" Value="{Binding RainbowSpeed}"
Width="175" Width="175"
@@ -36,13 +36,14 @@
Height="32" Height="32"
Padding="0,-5" Padding="0,-5"
TickFrequency="0.25" TickFrequency="0.25"
IsSnapToTickEnabled="True" LargeChange="1"
SmallChange="0.25"
VerticalAlignment="Center" VerticalAlignment="Center"
Minimum="1" Minimum="1"
Maximum="10" /> Maximum="10" />
<TextBlock Margin="5,0" <TextBlock Margin="5,0"
MinWidth="75" MinWidth="75"
Text="{Binding RainbowSpeed}"/> Text="{Binding RainbowSpeedText}" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}"> <StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
<TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColor}" /> <TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColor}" />

View File

@@ -1,11 +1,9 @@
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Models.Input; using Ryujinx.Ava.UI.Models.Input;
using Ryujinx.Ava.UI.ViewModels.Input; using Ryujinx.Ava.UI.ViewModels.Input;
using Ryujinx.Ava.UI.Views.Input;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.UI.Views.Input namespace Ryujinx.UI.Views.Input