Skip to content

Commit

Permalink
Merge pull request #1845 from Nexus-Mods/avalonia-labs-update
Browse files Browse the repository at this point in the history
Fix FlexPanel crashes by updating Avalonia Labs version
  • Loading branch information
erri120 authored Aug 6, 2024
2 parents ee9fd2f + 97c35ac commit 71863ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<ItemGroup>
<PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
<PackageVersion Include="Avalonia.Labs.Panels" Version="11.0.10.1" />
<PackageVersion Include="Avalonia.Labs.Panels" Version="11.1.0" />
<PackageVersion Include="AvaloniaEdit.TextMate" Version="11.0.6" />
<PackageVersion Include="Downloader" Version="3.1.2" />
<PackageVersion Include="FlatSharp.Compiler" Version="7.6.0" />
Expand Down Expand Up @@ -124,4 +124,4 @@
<PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="15.0.1" />
<PackageVersion Include="TransparentValueObjects" Version="1.0.1" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@
<!-- FlexPanel Styles -->
<Style Selector="panels|FlexPanel">

<!-- NOTE(Al12rs): `FlexPanel` has initial values that don't match the `FlexBox` specification. -->
<!-- Specification: https://www.w3.org/TR/css-flexbox-1/#property-index -->
<!-- This workaround can be removed once this PR on Avalonia.Labs repo is merged: -->
<!-- https://github.com/Nexus-Mods/NexusMods.App/pull/1725 -->
<Setter Property="AlignItems" Value="Stretch" />
<Setter Property="AlignContent" Value="Stretch" />
<Setter Property="Wrap" Value="NoWrap" />


<!-- NOTE(Al12rs): FlexPanel layout doesn't work correctly if its children don't have the default alignment (Stretch). -->
<!-- As a notable example, Buttons have Left alignment by default set in Avalonia.Fluent theme. -->
<Style Selector="^ > :is(Control)">
Expand Down

0 comments on commit 71863ef

Please sign in to comment.