mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
}
}