diff options
author | sunshineinabox <aqemail@gmail.com> | 2024-02-08 10:34:48 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-08 19:34:48 +0100 |
commit | 459efd0db7ac64a408860a1a94d9244753fb808e (patch) | |
tree | 98bce972122a56dc680d1e3bef6d5df35d989c7a | |
parent | 8bb7a3fc977db964b33645166e733b4b29259cb9 (diff) |
Replace Flex Panels in favor of Wrap Panels for Avalonia (#6267)1.1.1166
* Switch from using Flex panel to a Wrap panel for Grid view. This allows keyboard navigation.
* Stop using Flex panel in favor of Avalonia Wrap Panel.
-rw-r--r-- | Directory.Packages.props | 3 | ||||
-rw-r--r-- | src/Ryujinx.Ava/Ryujinx.Ava.csproj | 1 | ||||
-rw-r--r-- | src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml | 8 | ||||
-rw-r--r-- | src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml | 12 | ||||
-rw-r--r-- | src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml | 13 |
5 files changed, 14 insertions, 23 deletions
diff --git a/Directory.Packages.props b/Directory.Packages.props index e45ffcca..bea91391 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,7 +17,6 @@ <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" /> <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" /> <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" /> - <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.3.0-beta.4" /> <PackageVersion Include="LibHac" Version="0.19.0" /> <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" /> <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" /> @@ -51,4 +50,4 @@ <PackageVersion Include="System.Management" Version="8.0.0" /> <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Ryujinx.Ava/Ryujinx.Ava.csproj b/src/Ryujinx.Ava/Ryujinx.Ava.csproj index b6d37a2f..7f5224cf 100644 --- a/src/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/src/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -43,7 +43,6 @@ <PackageReference Include="Avalonia.Markup.Xaml.Loader" /> <PackageReference Include="Avalonia.Svg" /> <PackageReference Include="Avalonia.Svg.Skia" /> - <PackageReference Include="jp2masa.Avalonia.Flexbox" /> <PackageReference Include="DynamicData" /> <PackageReference Include="FluentAvaloniaUI" /> diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml index bbdb4c4a..2dc95662 100644 --- a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml +++ b/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml @@ -4,7 +4,6 @@ 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:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" @@ -33,11 +32,10 @@ SelectionChanged="GameList_SelectionChanged"> <ListBox.ItemsPanel> <ItemsPanelTemplate> - <flex:FlexPanel + <WrapPanel HorizontalAlignment="Center" - VerticalAlignment="Stretch" - AlignContent="FlexStart" - JustifyContent="FlexStart" /> + VerticalAlignment="Top" + Orientation="Horizontal" /> </ItemsPanelTemplate> </ListBox.ItemsPanel> <ListBox.Styles> diff --git a/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml index 818a21d6..3a9de303 100644 --- a/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml +++ b/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml @@ -4,7 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models" @@ -40,11 +39,10 @@ ItemsSource="{Binding Profiles}"> <ListBox.ItemsPanel> <ItemsPanelTemplate> - <flex:FlexPanel - HorizontalAlignment="Stretch" - VerticalAlignment="Stretch" - AlignContent="FlexStart" - JustifyContent="FlexStart" /> + <WrapPanel + HorizontalAlignment="Left" + VerticalAlignment="Center" + Orientation="Horizontal"/> </ItemsPanelTemplate> </ListBox.ItemsPanel> <ListBox.Styles> @@ -161,4 +159,4 @@ Content="{locale:Locale UserProfilesClose}" /> </StackPanel> </Grid> -</UserControl>
\ No newline at end of file +</UserControl> diff --git a/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml b/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml index a0fd2a1a..ace1094e 100644 --- a/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml +++ b/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml @@ -3,7 +3,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox" xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" @@ -49,13 +48,11 @@ Grid.Column="0" Height="80" Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" /> - <flex:FlexPanel + <WrapPanel Grid.Column="2" - HorizontalAlignment="Stretch" - VerticalAlignment="Stretch" - Direction="Column" - JustifyContent="SpaceAround" - RowSpacing="2"> + HorizontalAlignment="Right" + VerticalAlignment="Center" + Orientation="Vertical"> <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" @@ -71,7 +68,7 @@ Text="(REE-YOU-JINX)" TextAlignment="Center" Width="110" /> - </flex:FlexPanel> + </WrapPanel> </Grid> <TextBlock HorizontalAlignment="Center" |