|
@@ -7,6 +7,7 @@
|
|
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
|
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
|
|
|
+ xmlns:local="clr-namespace:Ryujinx.Ava.UI.Views.Main"
|
|
|
xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
|
|
xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
|
|
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
|
|
x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
|
|
x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
|
|
@@ -132,14 +133,7 @@
|
|
|
</Flyout>
|
|
</Flyout>
|
|
|
</Button.Flyout>
|
|
</Button.Flyout>
|
|
|
</Button>
|
|
</Button>
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Name="DockedStatus"
|
|
Name="DockedStatus"
|
|
|
Margin="5,0,5,0"
|
|
Margin="5,0,5,0"
|
|
@@ -149,14 +143,7 @@
|
|
|
PointerReleased="DockedStatus_PointerReleased"
|
|
PointerReleased="DockedStatus_PointerReleased"
|
|
|
Text="{Binding DockedStatusText}"
|
|
Text="{Binding DockedStatusText}"
|
|
|
TextAlignment="Start" />
|
|
TextAlignment="Start" />
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<SplitButton
|
|
<SplitButton
|
|
|
Name="AspectRatioStatus"
|
|
Name="AspectRatioStatus"
|
|
|
Padding="5,0,5,0"
|
|
Padding="5,0,5,0"
|
|
@@ -203,14 +190,7 @@
|
|
|
</MenuFlyout>
|
|
</MenuFlyout>
|
|
|
</SplitButton.Flyout>
|
|
</SplitButton.Flyout>
|
|
|
</SplitButton>
|
|
</SplitButton>
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<ToggleSplitButton
|
|
<ToggleSplitButton
|
|
|
Name="VolumeStatus"
|
|
Name="VolumeStatus"
|
|
|
Padding="5,0,5,0"
|
|
Padding="5,0,5,0"
|
|
@@ -254,14 +234,7 @@
|
|
|
</Flyout>
|
|
</Flyout>
|
|
|
</ToggleSplitButton.Flyout>
|
|
</ToggleSplitButton.Flyout>
|
|
|
</ToggleSplitButton>
|
|
</ToggleSplitButton>
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Margin="5,0,5,0"
|
|
Margin="5,0,5,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
@@ -269,14 +242,7 @@
|
|
|
IsVisible="{Binding !ShowLoadProgress}"
|
|
IsVisible="{Binding !ShowLoadProgress}"
|
|
|
Text="{Binding GameStatusText}"
|
|
Text="{Binding GameStatusText}"
|
|
|
TextAlignment="Start" />
|
|
TextAlignment="Start" />
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Margin="5,0,5,0"
|
|
Margin="5,0,5,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
@@ -298,13 +264,7 @@
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
IsVisible="{Binding ShowShaderCompilationHint}"
|
|
IsVisible="{Binding ShowShaderCompilationHint}"
|
|
|
Text="{Binding ShaderCountText}" />
|
|
Text="{Binding ShaderCountText}" />
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding ShowShaderCompilationHint}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Margin="5,0,5,0"
|
|
Margin="5,0,5,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
@@ -312,14 +272,7 @@
|
|
|
IsVisible="{Binding !ShowLoadProgress}"
|
|
IsVisible="{Binding !ShowLoadProgress}"
|
|
|
Text="{Binding BackendText}"
|
|
Text="{Binding BackendText}"
|
|
|
TextAlignment="Start" />
|
|
TextAlignment="Start" />
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- Background="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Margin="5,0,0,0"
|
|
Margin="5,0,0,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
@@ -334,13 +287,7 @@
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
IsVisible="{Binding ShowFirmwareStatus}"
|
|
IsVisible="{Binding ShowFirmwareStatus}"
|
|
|
Orientation="Horizontal">
|
|
Orientation="Horizontal">
|
|
|
- <Border
|
|
|
|
|
- Width="2"
|
|
|
|
|
- Height="12"
|
|
|
|
|
- Margin="0"
|
|
|
|
|
- BorderBrush="Gray"
|
|
|
|
|
- BorderThickness="1"
|
|
|
|
|
- IsVisible="{Binding IsGameRunning}" />
|
|
|
|
|
|
|
+ <local:StatusBarSeparator IsVisible="{Binding IsGameRunning}" />
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Name="FirmwareStatus"
|
|
Name="FirmwareStatus"
|
|
|
Margin="5, 0, 0, 0"
|
|
Margin="5, 0, 0, 0"
|