diff --git a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml b/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml index a70fc8d44..6186b7d93 100644 --- a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml +++ b/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml @@ -6,9 +6,11 @@ xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="{locale:Locale ErrorWindowTitle}" + xmlns:views="using:Ryujinx.Ava.UI.Applet" Width="450" Height="340" CanResize="False" + x:DataType="views:ErrorAppletWindow" SizeToContent="Height" mc:Ignorable="d" Focusable="True"> @@ -38,7 +40,7 @@ Grid.Column="1" Margin="10" VerticalAlignment="Stretch" - Text="{ReflectionBinding Message}" + Text="{Binding Message}" TextWrapping="Wrap" /> - \ No newline at end of file + diff --git a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml b/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml index 64b23f987..7e0836065 100644 --- a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml +++ b/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml @@ -4,7 +4,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:views="using:Ryujinx.Ava.UI.Controls" Width="400" + x:DataType="views:SwkbdAppletDialog" mc:Ignorable="d" Focusable="True"> diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml index 214fc0755..bbdb4c4a7 100644 --- a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml +++ b/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml @@ -46,7 +46,7 @@ @@ -56,10 +56,10 @@ Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - Classes.huge="{ReflectionBinding $parent[UserControl].DataContext.IsGridHuge}" - Classes.large="{ReflectionBinding $parent[UserControl].DataContext.IsGridLarge}" - Classes.normal="{ReflectionBinding $parent[UserControl].DataContext.IsGridMedium}" - Classes.small="{ReflectionBinding $parent[UserControl].DataContext.IsGridSmall}" + Classes.huge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}" + Classes.large="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}" + Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}" + Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}" ClipToBounds="True" CornerRadius="4"> @@ -78,7 +78,7 @@ Margin="0,10,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - IsVisible="{ReflectionBinding $parent[UserControl].DataContext.ShowNames}"> + IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}"> - \ No newline at end of file + diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml b/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml index 75bbf9d0d..09011005b 100644 --- a/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml +++ b/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml @@ -42,7 +42,7 @@ @@ -67,10 +67,10 @@ Grid.RowSpan="3" Grid.Column="0" Margin="0" - Classes.huge="{ReflectionBinding $parent[UserControl].DataContext.IsGridHuge}" - Classes.large="{ReflectionBinding $parent[UserControl].DataContext.IsGridLarge}" - Classes.normal="{ReflectionBinding $parent[UserControl].DataContext.IsGridMedium}" - Classes.small="{ReflectionBinding $parent[UserControl].DataContext.IsGridSmall}" + Classes.huge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}" + Classes.large="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}" + Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}" + Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}" Source="{Binding Icon, Converter={StaticResource ByteImage}}" /> - \ No newline at end of file + diff --git a/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml b/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml index b9cbcb9cc..8a5da5cc2 100644 --- a/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml +++ b/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml @@ -11,6 +11,7 @@ Height="500" MinWidth="500" MinHeight="500" + x:DataType="window:CheatWindow" WindowStartupLocation="CenterOwner" mc:Ignorable="d" Focusable="True"> @@ -40,7 +41,7 @@ HorizontalAlignment="Center" VerticalAlignment="Center" LineHeight="18" - Text="{ReflectionBinding Heading}" + Text="{Binding Heading}" TextAlignment="Center" TextWrapping="Wrap" /> + ItemsSource="{Binding LoadedCheats}">