emu-mirrors/Ryujinx
0
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2025-01-09 15:51:59 +00:00
Code Wiki Activity

misc: Move StatusBarSeparator into Controls namespace, rename to MiniVerticalSeparator

Browse source 
add bulk property change event method
give each markup extension its own property name
This commit is contained in:
Evan Husted 2024-12-24 21:55:12 -06:00
parent f0aa7eedf6
commit 0ca4d6e921
10 changed files with 78 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Ryujinx/Common/LocaleManager.cs
View file

@ -109,7 +109,7 @@ namespace Ryujinx.Ava.Common.Locale
{
_dynamicValues[key] = values;
OnPropertyChanged("Item");
OnPropertyChanged("Translation");
return this[key];
}
@ -138,7 +138,7 @@ namespace Ryujinx.Ava.Common.Locale
_localeStrings[key] = val;
}
OnPropertyChanged("Item");
OnPropertyChanged("Translation");
LocaleChanged?.Invoke();
}

2
src/Ryujinx/Common/Markup/BasicMarkupExtension.cs
View file

@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Common.Markup
{
internal abstract class BasicMarkupExtension<T> : MarkupExtension
{
public virtual string Name => "Item";
public abstract string Name { get; }
public virtual Action<object, T?>? Setter => null;
protected abstract T? Value { get; }

3
src/Ryujinx/Common/Markup/MarkupExtensions.cs
View file

@ -6,16 +6,19 @@ namespace Ryujinx.Ava.Common.Markup
{
internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
{
public override string Name => "Icon";
protected override Icon Value => new() { Value = iconString };
}
internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
{
public override string Name => "SIcon";
protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
}
internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
{
public override string Name => "Translation";
protected override string Value => LocaleManager.Instance[key];
protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension)

0
src/Ryujinx/UI/Controls/SliderScroll.axaml.cs → src/Ryujinx/UI/Controls/SliderScroll.cs
View file

19
src/Ryujinx/UI/Controls/StatusBarSeparator.cs Normal file
View file

@ -0,0 +1,19 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Media;
namespace Ryujinx.Ava.UI.Controls
{
public class MiniVerticalSeparator : Border
{
public MiniVerticalSeparator()
{
Width = 2;
Height = 12;
Margin = new Thickness();
BorderBrush = Brushes.Gray;
Background = Brushes.Gray;
BorderThickness = new Thickness(1);
}
}
}

9
src/Ryujinx/UI/ViewModels/BaseModel.cs
View file

@ -1,3 +1,4 @@
using System;
using System.ComponentModel;
using System.Runtime.CompilerServices;
@ -11,5 +12,13 @@ namespace Ryujinx.Ava.UI.ViewModels
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
{
foreach (var propertyName in propertyNames)
{
OnPropertyChanged(propertyName);
}
}
}
}

15
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View file

@ -71,8 +71,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
_resolutionScale = value;
OnPropertyChanged(nameof(CustomResolutionScale));
OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
OnPropertiesChanged(nameof(CustomResolutionScale), nameof(IsCustomResolutionScaleActive));
}
}
@ -181,8 +180,9 @@ namespace Ryujinx.Ava.UI.ViewModels
int newInterval = (int)((value / 100f) * 60);
_customVSyncInterval = newInterval;
_customVSyncIntervalPercentageProxy = value;
OnPropertyChanged((nameof(CustomVSyncInterval)));
OnPropertyChanged((nameof(CustomVSyncIntervalPercentageText)));
OnPropertiesChanged(
nameof(CustomVSyncInterval),
nameof(CustomVSyncIntervalPercentageText));
}
}
@ -190,7 +190,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
get
{
string text = CustomVSyncIntervalPercentageProxy.ToString() + "%";
string text = CustomVSyncIntervalPercentageProxy + "%";
return text;
}
}
@ -221,8 +221,9 @@ namespace Ryujinx.Ava.UI.ViewModels
_customVSyncInterval = value;
int newPercent = (int)((value / 60f) * 100);
_customVSyncIntervalPercentageProxy = newPercent;
OnPropertyChanged(nameof(CustomVSyncIntervalPercentageProxy));
OnPropertyChanged(nameof(CustomVSyncIntervalPercentageText));
OnPropertiesChanged(
nameof(CustomVSyncIntervalPercentageProxy),
nameof(CustomVSyncIntervalPercentageText));
OnPropertyChanged();
}
}

50
src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
View file

@ -91,39 +91,42 @@ namespace Ryujinx.Ava.UI.ViewModels
private void SortingChanged()
{
OnPropertyChanged(nameof(IsSortedByName));
OnPropertyChanged(nameof(IsSortedBySaved));
OnPropertyChanged(nameof(SortingAscending));
OnPropertyChanged(nameof(SortingField));
OnPropertyChanged(nameof(SortingFieldName));
OnPropertiesChanged(
nameof(IsSortedByName),
nameof(IsSortedBySaved),
nameof(SortingAscending),
nameof(SortingField),
nameof(SortingFieldName));
SortAndFilter();
}
private void DisplayedChanged()
{
OnPropertyChanged(nameof(Status));
OnPropertyChanged(nameof(DisplayedXCIFiles));
OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
OnPropertiesChanged(nameof(Status), nameof(DisplayedXCIFiles), nameof(SelectedDisplayedXCIFiles));
}
private void ApplicationsChanged()
{
OnPropertyChanged(nameof(AllXCIFiles));
OnPropertyChanged(nameof(Status));
OnPropertyChanged(nameof(PotentialSavings));
OnPropertyChanged(nameof(ActualSavings));
OnPropertyChanged(nameof(CanTrim));
OnPropertyChanged(nameof(CanUntrim));
OnPropertiesChanged(
nameof(AllXCIFiles),
nameof(Status),
nameof(PotentialSavings),
nameof(ActualSavings),
nameof(CanTrim),
nameof(CanUntrim));
DisplayedChanged();
SortAndFilter();
}
private void SelectionChanged(bool displayedChanged = true)
{
OnPropertyChanged(nameof(Status));
OnPropertyChanged(nameof(CanTrim));
OnPropertyChanged(nameof(CanUntrim));
OnPropertyChanged(nameof(SelectedXCIFiles));
OnPropertiesChanged(
nameof(Status),
nameof(CanTrim),
nameof(CanUntrim),
nameof(SelectedXCIFiles));
if (displayedChanged)
OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
@ -131,11 +134,12 @@ namespace Ryujinx.Ava.UI.ViewModels
private void ProcessingChanged()
{
OnPropertyChanged(nameof(Processing));
OnPropertyChanged(nameof(Cancel));
OnPropertyChanged(nameof(Status));
OnPropertyChanged(nameof(CanTrim));
OnPropertyChanged(nameof(CanUntrim));
OnPropertiesChanged(
nameof(Processing),
nameof(Cancel),
nameof(Status),
nameof(CanTrim),
nameof(CanUntrim));
}
private IEnumerable<XCITrimmerFileModel> GetSelectedDisplayedXCIFiles()

16
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
View file

@ -133,7 +133,7 @@
</Flyout>
</Button.Flyout>
</Button>
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<TextBlock
Name="DockedStatus"
Margin="5,0,5,0"
@ -143,7 +143,7 @@
PointerReleased="DockedStatus_PointerReleased"
Text="{Binding DockedStatusText}"
TextAlignment="Start" />
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<SplitButton
Name="AspectRatioStatus"
Padding="5,0,5,0"
@ -190,7 +190,7 @@
</MenuFlyout>
</SplitButton.Flyout>
</SplitButton>
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<ToggleSplitButton
Name="VolumeStatus"
Padding="5,0,5,0"
@ -234,7 +234,7 @@
</Flyout>
</ToggleSplitButton.Flyout>
</ToggleSplitButton>
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<TextBlock
Margin="5,0,5,0"
HorizontalAlignment="Left"
@ -242,7 +242,7 @@
IsVisible="{Binding !ShowLoadProgress}"
Text="{Binding GameStatusText}"
TextAlignment="Start" />
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<TextBlock
Margin="5,0,5,0"
HorizontalAlignment="Left"
@ -264,7 +264,7 @@
VerticalAlignment="Center"
IsVisible="{Binding ShowShaderCompilationHint}"
Text="{Binding ShaderCountText}" />
<local:StatusBarSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
<controls:MiniVerticalSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
<TextBlock
Margin="5,0,5,0"
HorizontalAlignment="Left"
@ -272,7 +272,7 @@
IsVisible="{Binding !ShowLoadProgress}"
Text="{Binding BackendText}"
TextAlignment="Start" />
<local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
<controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
<TextBlock
Margin="5,0,0,0"
HorizontalAlignment="Left"
@ -287,7 +287,7 @@
VerticalAlignment="Center"
IsVisible="{Binding ShowFirmwareStatus}"
Orientation="Horizontal">
<local:StatusBarSeparator IsVisible="{Binding IsGameRunning}" />
<controls:MiniVerticalSeparator IsVisible="{Binding IsGameRunning}" />
<TextBlock
Name="FirmwareStatus"
Margin="5, 0, 0, 0"

21
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
View file

@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Threading;
using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Windows;
@ -63,27 +62,9 @@ namespace Ryujinx.Ava.UI.Views.Main
// Change the volume by 5% at a time
float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
Window.ViewModel.Volume = newValue switch
{
< 0 => 0,
> 1 => 1,
_ => newValue,
};
Window.ViewModel.Volume = Math.Clamp(newValue, 0, 1);
e.Handled = true;
}
}
public class StatusBarSeparator : Border
{
public StatusBarSeparator()
{
Width = 2;
Height = 12;
Margin = new Thickness();
BorderBrush = Brushes.Gray;
Background = Brushes.Gray;
BorderThickness = new Thickness(1);
}
}
}