|
@@ -12,9 +12,9 @@
|
|
|
xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
|
|
xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
|
|
|
Title="Ryujinx"
|
|
Title="Ryujinx"
|
|
|
Width="1280"
|
|
Width="1280"
|
|
|
- Height="785"
|
|
|
|
|
|
|
+ Height="777"
|
|
|
MinWidth="1092"
|
|
MinWidth="1092"
|
|
|
- MinHeight="680"
|
|
|
|
|
|
|
+ MinHeight="672"
|
|
|
d:DesignHeight="720"
|
|
d:DesignHeight="720"
|
|
|
d:DesignWidth="1280"
|
|
d:DesignWidth="1280"
|
|
|
x:CompileBindings="True"
|
|
x:CompileBindings="True"
|
|
@@ -552,9 +552,8 @@
|
|
|
<Grid
|
|
<Grid
|
|
|
Name="StatusBar"
|
|
Name="StatusBar"
|
|
|
Grid.Row="2"
|
|
Grid.Row="2"
|
|
|
- MinHeight="30"
|
|
|
|
|
- Height="30"
|
|
|
|
|
- Margin="0,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
|
|
+ MinHeight="22"
|
|
|
HorizontalAlignment="Stretch"
|
|
HorizontalAlignment="Stretch"
|
|
|
VerticalAlignment="Bottom"
|
|
VerticalAlignment="Bottom"
|
|
|
Background="{DynamicResource ThemeContentBackgroundColor}"
|
|
Background="{DynamicResource ThemeContentBackgroundColor}"
|
|
@@ -568,7 +567,7 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
</Grid.ColumnDefinitions>
|
|
|
<StackPanel
|
|
<StackPanel
|
|
|
Grid.Column="0"
|
|
Grid.Column="0"
|
|
|
- Margin="10,0"
|
|
|
|
|
|
|
+ Margin="5"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
IsVisible="{Binding EnableNonGameRunningControls}">
|
|
IsVisible="{Binding EnableNonGameRunningControls}">
|
|
|
<Grid Margin="0">
|
|
<Grid Margin="0">
|
|
@@ -610,14 +609,14 @@
|
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
<StackPanel
|
|
<StackPanel
|
|
|
Grid.Column="1"
|
|
Grid.Column="1"
|
|
|
- Margin="10,0"
|
|
|
|
|
|
|
+ Margin="0,2"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
IsVisible="{Binding IsGameRunning}"
|
|
IsVisible="{Binding IsGameRunning}"
|
|
|
Orientation="Horizontal">
|
|
Orientation="Horizontal">
|
|
|
<TextBlock
|
|
<TextBlock
|
|
|
Name="VsyncStatus"
|
|
Name="VsyncStatus"
|
|
|
- Margin="0,0,5,0"
|
|
|
|
|
|
|
+ Margin="5,0,5,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
Foreground="{Binding VsyncColor}"
|
|
Foreground="{Binding VsyncColor}"
|
|
@@ -628,7 +627,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -644,7 +643,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -660,13 +659,13 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
|
<ui:ToggleSplitButton
|
|
<ui:ToggleSplitButton
|
|
|
Name="VolumeStatus"
|
|
Name="VolumeStatus"
|
|
|
- Padding="5"
|
|
|
|
|
|
|
+ Padding="5,0,5,0"
|
|
|
HorizontalAlignment="Left"
|
|
HorizontalAlignment="Left"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
VerticalContentAlignment="Center"
|
|
VerticalContentAlignment="Center"
|
|
@@ -679,6 +678,7 @@
|
|
|
<Flyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
|
|
<Flyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
|
|
|
<Grid Margin="0">
|
|
<Grid Margin="0">
|
|
|
<Slider
|
|
<Slider
|
|
|
|
|
+ MaxHeight="40"
|
|
|
Width="150"
|
|
Width="150"
|
|
|
Margin="0"
|
|
Margin="0"
|
|
|
Padding="0"
|
|
Padding="0"
|
|
@@ -697,7 +697,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -711,7 +711,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -725,7 +725,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -739,7 +739,7 @@
|
|
|
<Border
|
|
<Border
|
|
|
Width="2"
|
|
Width="2"
|
|
|
Height="12"
|
|
Height="12"
|
|
|
- Margin="2,0"
|
|
|
|
|
|
|
+ Margin="0"
|
|
|
BorderBrush="Gray"
|
|
BorderBrush="Gray"
|
|
|
BorderThickness="1"
|
|
BorderThickness="1"
|
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
IsVisible="{Binding !ShowLoadProgress}" />
|
|
@@ -753,7 +753,7 @@
|
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
<StackPanel
|
|
<StackPanel
|
|
|
Grid.Column="3"
|
|
Grid.Column="3"
|
|
|
- Margin="10,0"
|
|
|
|
|
|
|
+ Margin="0,0,5,0"
|
|
|
VerticalAlignment="Center"
|
|
VerticalAlignment="Center"
|
|
|
IsVisible="{Binding ShowFirmwareStatus}"
|
|
IsVisible="{Binding ShowFirmwareStatus}"
|
|
|
Orientation="Horizontal">
|
|
Orientation="Horizontal">
|