diff --git a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml index 764ff66..6b419c0 100644 --- a/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/CarouselDemo.axaml @@ -52,5 +52,22 @@ + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml index d69b82f..d6beab9 100644 --- a/src/Semi.Avalonia/Controls/Carousel.axaml +++ b/src/Semi.Avalonia/Controls/Carousel.axaml @@ -34,8 +34,8 @@ @@ -61,18 +61,12 @@ - + - - - - - + Width="{DynamicResource CarouselIndicatorLineWidth}" + Height="{DynamicResource CarouselIndicatorLineHeight}" + Background="{TemplateBinding Background}"> @@ -86,7 +80,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -136,7 +167,7 @@ Name="PART_ItemsPresenter2" Grid.Row="1" Grid.Column="1" - MaxHeight="20" + MaxHeight="30" Margin="0,8" HorizontalAlignment="Center" VerticalAlignment="Center" @@ -180,5 +211,17 @@ + + + + diff --git a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml index c225086..f32bfdc 100644 --- a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml +++ b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml @@ -1,7 +1,15 @@ M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z - 48 - 8 + 8 + 8 + + 78 + 4 + + 4 + 12 + 20 + 8 \ No newline at end of file