diff --git a/demo/Ursa.Demo/Pages/AnchorDemo.axaml b/demo/Ursa.Demo/Pages/AnchorDemo.axaml index 4c6250d..9f4c56b 100644 --- a/demo/Ursa.Demo/Pages/AnchorDemo.axaml +++ b/demo/Ursa.Demo/Pages/AnchorDemo.axaml @@ -79,17 +79,15 @@ Width="200" Margin="24" TargetContainer="{Binding ElementName=container1}"> - + - + - - @@ -201,7 +199,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Controls/Anchor.axaml b/src/Ursa.Themes.Semi/Controls/Anchor.axaml index 63a897e..87d292e 100644 --- a/src/Ursa.Themes.Semi/Controls/Anchor.axaml +++ b/src/Ursa.Themes.Semi/Controls/Anchor.axaml @@ -4,7 +4,7 @@ xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters" xmlns:iri="https://irihi.tech/shared" xmlns:u="https://irihi.tech/ursa"> - + @@ -12,7 +12,7 @@ - @@ -39,23 +39,23 @@ - + - - + + - + @@ -83,7 +83,7 @@ - diff --git a/src/Ursa.Themes.Semi/Converters/TreeLevelToMarginConverter.cs b/src/Ursa.Themes.Semi/Converters/TreeLevelToPaddingConverter.cs similarity index 55% rename from src/Ursa.Themes.Semi/Converters/TreeLevelToMarginConverter.cs rename to src/Ursa.Themes.Semi/Converters/TreeLevelToPaddingConverter.cs index b68433d..e99e9ea 100644 --- a/src/Ursa.Themes.Semi/Converters/TreeLevelToMarginConverter.cs +++ b/src/Ursa.Themes.Semi/Converters/TreeLevelToPaddingConverter.cs @@ -4,14 +4,15 @@ using Avalonia.Data.Converters; namespace Ursa.Themes.Semi.Converters; -public class TreeLevelToMarginConverter: IMultiValueConverter +public class TreeLevelToPaddingConverter : IMultiValueConverter { public object? Convert(IList values, Type targetType, object? parameter, CultureInfo culture) { - if (values[0] is int i && values[1] is double indent) + if (values[0] is int i && values[1] is Thickness indent) { - return new Thickness(Math.Max(i-1, 0) * indent, 0, 0, 0); + return new Thickness(Math.Max(i, 0) * indent.Left, indent.Top, indent.Right, indent.Bottom); } + return new Thickness(); } } \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Anchor.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Anchor.axaml index 770573b..1f56148 100644 --- a/src/Ursa.Themes.Semi/Themes/Shared/Anchor.axaml +++ b/src/Ursa.Themes.Semi/Themes/Shared/Anchor.axaml @@ -1,6 +1,8 @@ - 12 + 8,4,0,4 + 2 + 1 20 16 - - + 12 + \ No newline at end of file