Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-06 15:18:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clean up AXAML code

Browse Source 
* Remove unused namespaces
* Remove redundant attached property setters
* Use IsCheckedChanged in lieu of the obsolete Checked
* Optimize row & column definitions
This commit is contained in:
KeatonTheBot
2025-02-06 19:33:45 -06:00
parent da0c6c57f9
commit 69a1419be5
34 changed files with 204 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx/Assets/Styles/Styles.xaml
+1 -1
View File
@@ -20,7 +20,7 @@
</MenuItem> </MenuItem>
</MenuItem> </MenuItem>
</Menu> </Menu>
<StackPanel Orientation="Horizontal"> <StackPanel Grid.Row="0" Orientation="Horizontal">
<ToggleButton <ToggleButton
Name="btnAdd" Name="btnAdd"
Height="28" Height="28"
src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
+3 -10
View File
@@ -12,16 +12,9 @@
x:DataType="applet:ControllerAppletDialog"> x:DataType="applet:ControllerAppletDialog">
<Grid <Grid
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto"
<RowDefinition Height="Auto" /> ColumnDefinitions="*,Auto">
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Border <Border
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
+3 -10
View File
@@ -17,16 +17,9 @@
<Grid <Grid
Margin="20" Margin="20"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto"
<RowDefinition Height="Auto" /> ColumnDefinitions="Auto,*">
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image <Image
Grid.Row="1" Grid.Row="1"
Grid.RowSpan="2" Grid.RowSpan="2"
src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml
+4 -13
View File
@@ -12,21 +12,12 @@
<Grid <Grid
Margin="20" Margin="20"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto,Auto,Auto,Auto"
<RowDefinition Height="Auto" /> ColumnDefinitions="Auto,*">
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image <Image
Grid.Row="1" Grid.Row="1"
Grid.RowSpan="5" Grid.RowSpan="4"
Height="80" Height="80"
MinWidth="50" MinWidth="50"
Margin="5,10,20,10" Margin="5,10,20,10"
src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+2 -10
View File
@@ -2,7 +2,6 @@
x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView" x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -16,10 +15,7 @@
<UserControl.Resources> <UserControl.Resources>
<helpers:BitmapArrayValueConverter x:Key="ByteImage" /> <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid RowDefinitions="*">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ListBox <ListBox
Grid.Row="0" Grid.Row="0"
Padding="8" Padding="8"
@@ -59,11 +55,7 @@
Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}" Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
ClipToBounds="True" ClipToBounds="True"
CornerRadius="4"> CornerRadius="4">
<Grid> <Grid RowDefinitions="Auto,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image <Image
Grid.Row="0" Grid.Row="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
src/Ryujinx/UI/Controls/ApplicationListView.axaml
+1 -9
View File
@@ -2,7 +2,6 @@
x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView" x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -54,14 +53,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
ClipToBounds="True" ClipToBounds="True"
CornerRadius="5"> CornerRadius="5">
<Grid> <Grid ColumnDefinitions="Auto,10,*,150,100">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="100" />
</Grid.ColumnDefinitions>
<Image <Image
Grid.RowSpan="3" Grid.RowSpan="3"
Grid.Column="0" Grid.Column="0"
src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+3 -9
View File
@@ -13,15 +13,9 @@
<Grid <Grid
Margin="20" Margin="20"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto"
<RowDefinition Height="Auto" /> ColumnDefinitions="Auto,*">
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Image <Image
Grid.Row="1" Grid.Row="1"
Height="70" Height="70"
src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+10 -34
View File
@@ -36,12 +36,8 @@
<!-- Button / JoyStick Settings --> <!-- Button / JoyStick Settings -->
<Grid <Grid
Name="SettingButtons" Name="SettingButtons"
MinHeight="450"> MinHeight="450"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<!-- Left Controls --> <!-- Left Controls -->
<StackPanel <StackPanel
Orientation="Vertical" Orientation="Vertical"
@@ -56,15 +52,9 @@
CornerRadius="5"> CornerRadius="5">
<Grid <Grid
Margin="10" Margin="10"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="*,*"
<ColumnDefinition /> RowDefinitions="*,*">
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
@@ -440,11 +430,7 @@
CornerRadius="5" CornerRadius="5"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<Grid> <Grid ColumnDefinitions="*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox <CheckBox
Margin="10" Margin="10"
MinWidth="0" MinWidth="0"
@@ -466,11 +452,7 @@
CornerRadius="5" CornerRadius="5"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Margin="0,-1,0,0"> Margin="0,-1,0,0">
<Grid> <Grid ColumnDefinitions="*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox <CheckBox
Margin="10" Margin="10"
MinWidth="0" MinWidth="0"
@@ -502,15 +484,9 @@
CornerRadius="5"> CornerRadius="5">
<Grid <Grid
Margin="10" Margin="10"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="*,*"
<ColumnDefinition /> RowDefinitions="*,*">
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"
src/Ryujinx/UI/Views/Input/InputView.axaml
+10 -36
View File
@@ -35,22 +35,14 @@
Margin="0 0 0 5" Margin="0 0 0 5"
Orientation="Vertical" Orientation="Vertical"
Spacing="5"> Spacing="5">
<Grid> <Grid ColumnDefinitions="*,10,*">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Player Selection --> <!-- Player Selection -->
<Grid <Grid
Grid.Column="0" Grid.Column="0"
Margin="2" Margin="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Margin="5,0,10,0" Margin="5,0,10,0"
Width="90" Width="90"
@@ -77,14 +69,8 @@
Grid.Column="2" Grid.Column="2"
Margin="2" Margin="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*,Auto,Auto,Auto">
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Margin="5,0,10,0" Margin="5,0,10,0"
Width="90" Width="90"
@@ -139,22 +125,13 @@
</Grid> </Grid>
</Grid> </Grid>
<Separator /> <Separator />
<Grid> <Grid ColumnDefinitions="*,10,*">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Input Device --> <!-- Input Device -->
<Grid <Grid
Grid.Column="0" Grid.Column="0"
Margin="2" Margin="2"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*,Auto">
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Margin="5,0,10,0" Margin="5,0,10,0"
@@ -186,11 +163,8 @@
Grid.Column="2" Grid.Column="2"
Margin="2" Margin="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Margin="5,0,10,0" Margin="5,0,10,0"
Width="90" Width="90"
src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
+8 -24
View File
@@ -35,12 +35,8 @@
<!-- Button / JoyStick Settings --> <!-- Button / JoyStick Settings -->
<Grid <Grid
Name="SettingButtons" Name="SettingButtons"
MinHeight="450"> MinHeight="450"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<!-- Left Controls --> <!-- Left Controls -->
<StackPanel <StackPanel
Orientation="Vertical" Orientation="Vertical"
@@ -55,15 +51,9 @@
CornerRadius="5"> CornerRadius="5">
<Grid <Grid
Margin="10" Margin="10"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="*,*"
<ColumnDefinition /> RowDefinitions="*,*">
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
@@ -416,15 +406,9 @@
CornerRadius="5"> CornerRadius="5">
<Grid <Grid
Margin="10" Margin="10"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="*,*"
<ColumnDefinition /> RowDefinitions="*,*">
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"
src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+9 -19
View File
@@ -11,11 +11,9 @@
x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView" x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
x:DataType="viewModels:MotionInputViewModel" x:DataType="viewModels:MotionInputViewModel"
Focusable="True"> Focusable="True">
<Grid Margin="10"> <Grid
<Grid.RowDefinitions> Margin="10"
<RowDefinition Height="Auto" /> RowDefinitions="Auto,*">
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel <StackPanel
Orientation="Horizontal" Orientation="Horizontal"
@@ -80,11 +78,9 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<Grid VerticalAlignment="Top"> <Grid
<Grid.RowDefinitions> VerticalAlignment="Top"
<RowDefinition Height="Auto" /> RowDefinitions="Auto,*">
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="1" Grid.Row="1"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -118,15 +114,9 @@
Text="{Binding DsuServerPort, Mode=TwoWay}" /> Text="{Binding DsuServerPort, Mode=TwoWay}" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Grid> <Grid
<Grid.RowDefinitions> RowDefinitions="*,*"
<RowDefinition /> ColumnDefinitions="*,*">
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Margin="0,10,0,0" Margin="0,10,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
+3 -5
View File
@@ -10,11 +10,9 @@
x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView" x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
x:DataType="viewModels:RumbleInputViewModel" x:DataType="viewModels:RumbleInputViewModel"
Focusable="True"> Focusable="True">
<Grid Margin="10"> <Grid
<Grid.RowDefinitions> Margin="10"
<RowDefinition Height="Auto" /> RowDefinitions="Auto,*">
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
-2
View File
@@ -4,10 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:uih="clr-namespace:Ryujinx.UI.Common.Helper"
mc:Ignorable="d" mc:Ignorable="d"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:helper="clr-namespace:Ryujinx.UI.Common.Helper;assembly=Ryujinx.UI.Common"
x:DataType="viewModels:MainWindowViewModel" x:DataType="viewModels:MainWindowViewModel"
x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView"> x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
<Design.DataContext> <Design.DataContext>
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+48 -57
View File
@@ -22,25 +22,16 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Background="{DynamicResource ThemeContentBackgroundColor}" Background="{DynamicResource ThemeContentBackgroundColor}"
DockPanel.Dock="Bottom" DockPanel.Dock="Bottom"
IsVisible="{Binding ShowMenuAndStatusBar}"> IsVisible="{Binding ShowMenuAndStatusBar}"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,Auto,*,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Margin="5" Margin="5"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{Binding EnableNonGameRunningControls}"> IsVisible="{Binding EnableNonGameRunningControls}">
<Grid Margin="0"> <Grid
<Grid.ColumnDefinitions> Margin="0"
<ColumnDefinition Width="Auto" /> ColumnDefinitions="Auto,Auto,Auto,*">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button <Button
Width="25" Width="25"
Height="25" Height="25"
@@ -99,50 +90,50 @@
PointerReleased="VSyncMode_PointerReleased" PointerReleased="VSyncMode_PointerReleased"
Text="{Binding VSyncModeText}" Text="{Binding VSyncModeText}"
TextAlignment="Start"/> TextAlignment="Start"/>
<Button MinWidth="0" <Button MinWidth="0"
Width="20" Width="20"
IsVisible="{Binding ShowCustomVSyncIntervalPicker}" IsVisible="{Binding ShowCustomVSyncIntervalPicker}"
Margin="-5,0,5,0" Margin="-5,0,5,0"
Background="Transparent" Background="Transparent"
BorderThickness="0"> BorderThickness="0">
<ui:SymbolIcon Symbol="Settings" <ui:SymbolIcon Symbol="Settings"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Width="14" Width="14"
Height="14"/> Height="14"/>
<Button.Styles> <Button.Styles>
<Style Selector=":checked"> <Style Selector=":checked">
<Style Selector="^:checked ContentPresenter"> <Style Selector="^:checked ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" /> <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
</Style>
</Style> </Style>
<Style Selector="Border#SeparatorBorder"> </Style>
<Setter Property="Opacity" Value="0" /> <Style Selector="Border#SeparatorBorder">
</Style> <Setter Property="Opacity" Value="0" />
</Button.Styles> </Style>
<Button.Flyout> </Button.Styles>
<Flyout Placement="Top" ShowMode="TransientWithDismissOnPointerMoveAway"> <Button.Flyout>
<StackPanel Margin="0,0,0,0" <Flyout Placement="Top" ShowMode="TransientWithDismissOnPointerMoveAway">
Orientation="Horizontal"> <StackPanel Margin="0,0,0,0"
<Slider Value="{Binding CustomVSyncIntervalPercentageProxy}" Orientation="Horizontal">
MinWidth="175" <Slider Value="{Binding CustomVSyncIntervalPercentageProxy}"
Margin="0,-3,0,0" MinWidth="175"
Height="32" Margin="0,-3,0,0"
Padding="0,-5" Height="32"
TickFrequency="1" Padding="0,-5"
IsSnapToTickEnabled="True" TickFrequency="1"
LargeChange="10" IsSnapToTickEnabled="True"
SmallChange="1" LargeChange="10"
VerticalAlignment="Center" SmallChange="1"
Minimum="10" VerticalAlignment="Center"
Maximum="400" /> Minimum="10"
<TextBlock Margin="5,0" Maximum="400" />
Width="40" <TextBlock Margin="5,0"
Text="{Binding CustomVSyncIntervalPercentageText}"/> Width="40"
</StackPanel> Text="{Binding CustomVSyncIntervalPercentageText}"/>
</Flyout> </StackPanel>
</Button.Flyout> </Flyout>
</Button> </Button.Flyout>
</Button>
<Border <Border
Width="2" Width="2"
Height="12" Height="12"
src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+10 -10
View File
@@ -94,49 +94,49 @@
Orientation="Vertical"> Orientation="Vertical">
<StackPanel> <StackPanel>
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale CommonFavorite}" Content="{locale:Locale CommonFavorite}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}" IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}"
Tag="Favorite" /> Tag="Favorite" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderApplication}" Content="{locale:Locale GameListHeaderApplication}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByTitle, Mode=OneTime}" IsChecked="{Binding IsSortedByTitle, Mode=OneTime}"
Tag="Title" /> Tag="Title" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderDeveloper}" Content="{locale:Locale GameListHeaderDeveloper}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByDeveloper, Mode=OneTime}" IsChecked="{Binding IsSortedByDeveloper, Mode=OneTime}"
Tag="Developer" /> Tag="Developer" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderTimePlayed}" Content="{locale:Locale GameListHeaderTimePlayed}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByTimePlayed, Mode=OneTime}" IsChecked="{Binding IsSortedByTimePlayed, Mode=OneTime}"
Tag="TotalTimePlayed" /> Tag="TotalTimePlayed" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderLastPlayed}" Content="{locale:Locale GameListHeaderLastPlayed}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}" IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}"
Tag="LastPlayed" /> Tag="LastPlayed" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderFileExtension}" Content="{locale:Locale GameListHeaderFileExtension}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByType, Mode=OneTime}" IsChecked="{Binding IsSortedByType, Mode=OneTime}"
Tag="FileType" /> Tag="FileType" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderFileSize}" Content="{locale:Locale GameListHeaderFileSize}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedBySize, Mode=OneTime}" IsChecked="{Binding IsSortedBySize, Mode=OneTime}"
Tag="FileSize" /> Tag="FileSize" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale GameListHeaderPath}" Content="{locale:Locale GameListHeaderPath}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByPath, Mode=OneTime}" IsChecked="{Binding IsSortedByPath, Mode=OneTime}"
@@ -152,13 +152,13 @@
<Separator Height="0" HorizontalAlignment="Stretch" /> <Separator Height="0" HorizontalAlignment="Stretch" />
</Border> </Border>
<RadioButton <RadioButton
Checked="Order_Checked" IsCheckedChanged="Order_Checked"
Content="{locale:Locale OrderAscending}" Content="{locale:Locale OrderAscending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding IsAscending, Mode=OneTime}" IsChecked="{Binding IsAscending, Mode=OneTime}"
Tag="Ascending" /> Tag="Ascending" />
<RadioButton <RadioButton
Checked="Order_Checked" IsCheckedChanged="Order_Checked"
Content="{locale:Locale OrderDescending}" Content="{locale:Locale OrderDescending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding !IsAscending, Mode=OneTime}" IsChecked="{Binding !IsAscending, Mode=OneTime}"
src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+2 -7
View File
@@ -1,4 +1,4 @@
<UserControl <UserControl
x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView" x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -21,12 +21,7 @@
<Border Classes="settings"> <Border Classes="settings">
<Panel <Panel
Margin="10"> Margin="10">
<Grid> <Grid RowDefinitions="Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<views:InputView <views:InputView
Grid.Row="0" Grid.Row="0"
Name="InputView" /> Name="InputView" />
src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
-2
View File
@@ -61,7 +61,6 @@
Watermark="{locale:Locale LdnPassphraseInputPublic}" /> Watermark="{locale:Locale LdnPassphraseInputPublic}" />
<Button <Button
Name="GenLdnPassButton" Name="GenLdnPassButton"
Grid.Column="1"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="10,0,0,0"
ToolTip.Tip="{locale:Locale GenLdnPassTooltip}" ToolTip.Tip="{locale:Locale GenLdnPassTooltip}"
@@ -71,7 +70,6 @@
</Button> </Button>
<Button <Button
Name="ClearLdnPassButton" Name="ClearLdnPassButton"
Grid.Column="1"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="10,0,0,0"
ToolTip.Tip="{locale:Locale ClearLdnPassTooltip}" ToolTip.Tip="{locale:Locale ClearLdnPassTooltip}"
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
-1
View File
@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+6 -12
View File
@@ -95,12 +95,9 @@
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
</ListBox> </ListBox>
<Grid HorizontalAlignment="Stretch"> <Grid
<Grid.ColumnDefinitions> HorizontalAlignment="Stretch"
<ColumnDefinition Width="*" /> ColumnDefinitions="*,Auto,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox <TextBox
Name="GameDirPathBox" Name="GameDirPathBox"
Margin="0" Margin="0"
@@ -149,12 +146,9 @@
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
</ListBox> </ListBox>
<Grid HorizontalAlignment="Stretch"> <Grid
<Grid.ColumnDefinitions> HorizontalAlignment="Stretch"
<ColumnDefinition Width="*" /> ColumnDefinitions="*,Auto,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox <TextBox
Name="AutoloadDirPathBox" Name="AutoloadDirPathBox"
Margin="0" Margin="0"
src/Ryujinx/UI/Views/User/UserEditorView.axaml
+4 -9
View File
@@ -17,15 +17,10 @@
<UserControl.Resources> <UserControl.Resources>
<helpers:BitmapArrayValueConverter x:Key="ByteImage" /> <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="0"> <Grid
<Grid.ColumnDefinitions> Margin="0"
<ColumnDefinition Width="Auto" /> ColumnDefinitions="Auto,*"
<ColumnDefinition /> RowDefinitions="*,Auto">
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+2 -7
View File
@@ -23,13 +23,8 @@
<Grid <Grid
Margin="0" Margin="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ListBox <ListBox
Grid.Row="1" Grid.Row="1"
BorderThickness="0" BorderThickness="0"
src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
+2 -6
View File
@@ -17,12 +17,8 @@
</Design.DataContext> </Design.DataContext>
<Grid <Grid
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Center"
<Grid.RowDefinitions> RowDefinitions="Auto,70,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="70" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
TextWrapping="Wrap" TextWrapping="Wrap"
src/Ryujinx/UI/Views/User/UserRecovererView.axaml
+4 -6
View File
@@ -17,12 +17,10 @@
<Design.DataContext> <Design.DataContext>
<viewModels:UserProfileViewModel /> <viewModels:UserProfileViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" <Grid
VerticalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.RowDefinitions> VerticalAlignment="Stretch"
<RowDefinition/> RowDefinitions="*,Auto">
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border <Border
CornerRadius="5" CornerRadius="5"
BorderBrush="{DynamicResource AppListHoverBackgroundColor}" BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+9 -21
View File
@@ -22,19 +22,12 @@
<UserControl.Resources> <UserControl.Resources>
<helpers:BitmapArrayValueConverter x:Key="ByteImage" /> <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto">
<RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid <Grid
Grid.Row="0" Grid.Row="0"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Spacing="10" Spacing="10"
Orientation="Horizontal" Orientation="Horizontal"
@@ -83,11 +76,8 @@
<Grid <Grid
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Margin="10,0, 0, 0"> Margin="10,0,0,0"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Label Content="{locale:Locale Search}" VerticalAlignment="Center" /> <Label Content="{locale:Locale Search}" VerticalAlignment="Center" />
<TextBox <TextBox
Margin="5,0,0,0" Margin="5,0,0,0"
@@ -121,11 +111,9 @@
</ListBox.Styles> </ListBox.Styles>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate x:DataType="models:SaveModel"> <DataTemplate x:DataType="models:SaveModel">
<Grid HorizontalAlignment="Stretch"> <Grid
<Grid.ColumnDefinitions> HorizontalAlignment="Stretch"
<ColumnDefinition /> ColumnDefinitions="*,Auto">
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Orientation="Horizontal" Orientation="Horizontal"
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+4 -5
View File
@@ -21,11 +21,10 @@
<Design.DataContext> <Design.DataContext>
<viewModels:UserProfileViewModel /> <viewModels:UserProfileViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid
<Grid.RowDefinitions> HorizontalAlignment="Stretch"
<RowDefinition /> VerticalAlignment="Stretch"
<RowDefinition Height="Auto" /> RowDefinitions="*,Auto">
</Grid.RowDefinitions>
<Border <Border
CornerRadius="5" CornerRadius="5"
BorderBrush="{DynamicResource AppListHoverBackgroundColor}" BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
src/Ryujinx/UI/Windows/AboutWindow.axaml
+10 -25
View File
@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModel="clr-namespace:Ryujinx.Ava.UI.ViewModels"
Width="550" Width="550"
Height="260" Height="260"
@@ -18,32 +17,22 @@
<Design.DataContext> <Design.DataContext>
<viewModel:AboutWindowViewModel /> <viewModel:AboutWindowViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid
<Grid.ColumnDefinitions> HorizontalAlignment="Stretch"
<ColumnDefinition Width="Auto" /> VerticalAlignment="Stretch"
<ColumnDefinition Width="Auto" /> ColumnDefinitions="Auto,Auto,*">
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid <Grid
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Spacing="10"> Spacing="10">
<Grid> <Grid
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Orientation="Horizontal" Orientation="Horizontal"
@@ -143,12 +132,8 @@
<Grid <Grid
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Margin="0,10,0,0" Margin="0,10,0,0"
src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+6 -20
View File
@@ -22,18 +22,10 @@
<Design.DataContext> <Design.DataContext>
<viewModels:AmiiboWindowViewModel /> <viewModels:AmiiboWindowViewModel />
</Design.DataContext> </Design.DataContext>
<Grid Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto,*,Auto">
<RowDefinition Height="Auto" /> <Grid Grid.Row="1" HorizontalAlignment="Stretch"
<RowDefinition Height="Auto" /> ColumnDefinitions="*,*">
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Row="1" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left"> <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock VerticalAlignment="Center" Text="{locale:Locale AmiiboSeriesLabel}" /> <TextBlock VerticalAlignment="Center" Text="{locale:Locale AmiiboSeriesLabel}" />
<ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" /> <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
@@ -51,14 +43,8 @@
TextAlignment="Center" /> TextAlignment="Center" />
</ScrollViewer> </ScrollViewer>
</StackPanel> </StackPanel>
<Grid Grid.Row="3"> <Grid Grid.Row="3"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,Auto,*,Auto,Auto">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center" IsChecked="{Binding ShowAllAmiibo}" <CheckBox Margin="10" Grid.Column="0" VerticalContentAlignment="Center" IsChecked="{Binding ShowAllAmiibo}"
Content="{locale:Locale AmiiboOptionsShowAllLabel}" /> Content="{locale:Locale AmiiboOptionsShowAllLabel}" />
<CheckBox HotKey="H" <CheckBox HotKey="H"
src/Ryujinx/UI/Windows/CheatWindow.axaml
+4 -13
View File
@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:model="clr-namespace:Ryujinx.Ava.UI.Models"
xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows" xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
Width="600" Width="600"
Height="750" Height="750"
@@ -20,18 +19,10 @@
<Setter Property="IsExpanded" Value="True" /> <Setter Property="IsExpanded" Value="True" />
</Style> </Style>
</Window.Styles> </Window.Styles>
<Grid Name="CheatGrid" Margin="15"> <Grid
<Grid.RowDefinitions> Name="CheatGrid" Margin="15"
<RowDefinition Height="Auto" /> RowDefinitions="Auto,Auto,Auto,*,Auto"
<RowDefinition Height="Auto" /> ColumnDefinitions="*,*">
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
+5 -24
View File
@@ -8,7 +8,6 @@
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common" xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:pi="using:Projektanker.Icons.Avalonia"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
Width="500" Width="500"
Height="380" Height="380"
@@ -18,13 +17,7 @@
<UserControl.Resources> <UserControl.Resources>
<helpers:DownloadableContentLabelConverter x:Key="DownloadableContentLabel" /> <helpers:DownloadableContentLabelConverter x:Key="DownloadableContentLabel" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid RowDefinitions="Auto,Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Margin="0 0 0 10" Margin="0 0 0 10"
@@ -45,12 +38,7 @@
<Panel <Panel
Margin="0 0 0 10" Margin="0 0 0 10"
Grid.Row="1"> Grid.Row="1">
<Grid> <Grid ColumnDefinitions="Auto,Auto,*">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Text="{Binding UpdateCount}" /> Text="{Binding UpdateCount}" />
@@ -102,17 +90,10 @@
<DataTemplate <DataTemplate
DataType="models:DownloadableContentModel"> DataType="models:DownloadableContentModel">
<Panel Margin="10"> <Panel Margin="10">
<Grid> <Grid ColumnDefinitions="*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid <Grid
Grid.Column="0"> Grid.Column="0"
<Grid.ColumnDefinitions> ColumnDefinitions="*,Auto">
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
src/Ryujinx/UI/Windows/MainWindow.axaml
+9 -25
View File
@@ -49,15 +49,9 @@
<helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" /> <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />
<Grid <Grid
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch"
<Grid.ColumnDefinitions> ColumnDefinitions="*"
<ColumnDefinition Width="*" /> RowDefinitions="Auto,*,Auto">
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Name="MenuBar" Name="MenuBar"
MinHeight="35" MinHeight="35"
@@ -80,11 +74,8 @@
BorderThickness="0,0,0,0" BorderThickness="0,0,0,0"
DockPanel.Dock="Top" DockPanel.Dock="Top"
IsVisible="{Binding ShowContent}"> IsVisible="{Binding ShowContent}">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="GameLibrary"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Name="GameLibrary"
<Grid.RowDefinitions> RowDefinitions="Auto,*">
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<main:MainViewControls <main:MainViewControls
Name="ViewControls" Name="ViewControls"
Grid.Row="0"/> Grid.Row="0"/>
@@ -118,11 +109,8 @@
Margin="40" Margin="40"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{Binding ShowLoadProgress}"> IsVisible="{Binding ShowLoadProgress}"
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*">
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Border <Border
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.Column="0" Grid.Column="0"
@@ -145,12 +133,8 @@
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{Binding ShowLoadProgress}"> IsVisible="{Binding ShowLoadProgress}"
<Grid.RowDefinitions> RowDefinitions="Auto,Auto,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="10" Margin="10"
src/Ryujinx/UI/Windows/ModManagerWindow.axaml
+3 -17
View File
@@ -14,21 +14,11 @@
x:CompileBindings="True" x:CompileBindings="True"
x:DataType="viewModels:ModManagerViewModel" x:DataType="viewModels:ModManagerViewModel"
Focusable="True"> Focusable="True">
<Grid> <Grid RowDefinitions="Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Panel <Panel
Margin="0 0 0 10" Margin="0 0 0 10"
Grid.Row="0"> Grid.Row="0">
<Grid> <Grid ColumnDefinitions="Auto,Auto,*">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Text="{Binding ModCount}" /> Text="{Binding ModCount}" />
@@ -80,11 +70,7 @@
<DataTemplate <DataTemplate
DataType="models:ModModel"> DataType="models:ModModel">
<Panel Margin="10"> <Panel Margin="10">
<Grid> <Grid ColumnDefinitions="*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
src/Ryujinx/UI/Windows/SettingsWindow.axaml
+2 -7
View File
@@ -21,12 +21,8 @@
<Design.DataContext> <Design.DataContext>
<viewModels:SettingsViewModel /> <viewModels:SettingsViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600"
<Grid.RowDefinitions> RowDefinitions="Auto,*,Auto">
<RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ContentPresenter <ContentPresenter
x:Name="ContentPresenter" x:Name="ContentPresenter"
Grid.Row="1" Grid.Row="1"
@@ -114,7 +110,6 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
ReverseOrder="{Binding IsMacOS}"> ReverseOrder="{Binding IsMacOS}">
<Button <Button
Classes="accent"
Content="{locale:Locale SettingsButtonOk}" Content="{locale:Locale SettingsButtonOk}"
Command="{Binding OkButton}" /> Command="{Binding OkButton}" />
<Button <Button
src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
+1 -6
View File
@@ -17,12 +17,7 @@
<UserControl.Resources> <UserControl.Resources>
<helpers:TitleUpdateLabelConverter x:Key="TitleUpdateLabel" /> <helpers:TitleUpdateLabelConverter x:Key="TitleUpdateLabel" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid RowDefinitions="Auto,*,Auto">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel <StackPanel
Grid.Row="0" Grid.Row="0"
Margin="0 0 0 10" Margin="0 0 0 10"
src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml
+16 -43
View File
@@ -7,7 +7,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common" xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
Width="700" Width="700"
Height="600" Height="600"
@@ -19,14 +18,9 @@
<helpers:XCITrimmerFileStatusDetailConverter x:Key="StatusDetailLabel" /> <helpers:XCITrimmerFileStatusDetailConverter x:Key="StatusDetailLabel" />
<helpers:XCITrimmerFileSpaceSavingsConverter x:Key="SpaceSavingsLabel" /> <helpers:XCITrimmerFileSpaceSavingsConverter x:Key="SpaceSavingsLabel" />
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="20 0 20 0"> <Grid
<Grid.RowDefinitions> Margin="20 0 20 0"
<RowDefinition Height="Auto" /> RowDefinitions="Auto,Auto,*,Auto,Auto">
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Panel <Panel
Margin="10 10 10 10" Margin="10 10 10 10"
Grid.Row="0"> Grid.Row="0">
@@ -36,12 +30,7 @@
Margin="0 0 10 10" Margin="0 0 10 10"
IsVisible="{Binding !Processing}" IsVisible="{Binding !Processing}"
Grid.Row="1"> Grid.Row="1">
<Grid> <Grid ColumnDefinitions="Auto,*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Orientation="Horizontal"> Orientation="Horizontal">
@@ -63,13 +52,13 @@
Orientation="Vertical"> Orientation="Vertical">
<StackPanel> <StackPanel>
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale XCITrimmerSortName}" Content="{locale:Locale XCITrimmerSortName}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByName, Mode=OneTime}" IsChecked="{Binding IsSortedByName, Mode=OneTime}"
Tag="Name" /> Tag="Name" />
<RadioButton <RadioButton
Checked="Sort_Checked" IsCheckedChanged="Sort_Checked"
Content="{locale:Locale XCITrimmerSortSaved}" Content="{locale:Locale XCITrimmerSortSaved}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedBySaved, Mode=OneTime}" IsChecked="{Binding IsSortedBySaved, Mode=OneTime}"
@@ -85,13 +74,13 @@
<Separator Height="0" HorizontalAlignment="Stretch" /> <Separator Height="0" HorizontalAlignment="Stretch" />
</Border> </Border>
<RadioButton <RadioButton
Checked="Order_Checked" IsCheckedChanged="Order_Checked"
Content="{locale:Locale OrderAscending}" Content="{locale:Locale OrderAscending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding SortingAscending, Mode=OneTime}" IsChecked="{Binding SortingAscending, Mode=OneTime}"
Tag="Ascending" /> Tag="Ascending" />
<RadioButton <RadioButton
Checked="Order_Checked" IsCheckedChanged="Order_Checked"
Content="{locale:Locale OrderDescending}" Content="{locale:Locale OrderDescending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding !SortingAscending, Mode=OneTime}" IsChecked="{Binding !SortingAscending, Mode=OneTime}"
@@ -151,11 +140,7 @@
<DataTemplate <DataTemplate
DataType="models:XCITrimmerFileModel"> DataType="models:XCITrimmerFileModel">
<Panel Margin="10"> <Panel Margin="10">
<Grid> <Grid ColumnDefinitions="65*,35*">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="65*" />
<ColumnDefinition Width="35*" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Margin="10 0 10 0" Margin="10 0 10 0"
@@ -166,11 +151,9 @@
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
Text="{Binding Name}"> Text="{Binding Name}">
</TextBlock> </TextBlock>
<Grid Grid.Column="1"> <Grid
<Grid.ColumnDefinitions> Grid.Column="1"
<ColumnDefinition Width="45*" /> ColumnDefinitions="45*,55*">
<ColumnDefinition Width="55*" />
</Grid.ColumnDefinitions>
<ProgressBar <ProgressBar
Height="10" Height="10"
Margin="10 0 10 0" Margin="10 0 10 0"
@@ -232,15 +215,9 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="5" CornerRadius="5"
Padding="2.5"> Padding="2.5">
<Grid> <Grid
<Grid.ColumnDefinitions> ColumnDefinitions="Auto,*"
<ColumnDefinition Width="Auto" /> RowDefinitions="Auto,Auto">
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
@@ -280,11 +257,7 @@
<Panel <Panel
Grid.Row="4" Grid.Row="4"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<Grid> <Grid ColumnDefinitions="*,Auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel <StackPanel
Grid.Column="0" Grid.Column="0"
Orientation="Horizontal" Orientation="Horizontal"