From c8d77d34c43853277f53b512d39e20eb2a78dfee Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Fri, 13 Aug 2021 15:35:13 +0100 Subject: [PATCH] Fix extra padding --- src/Compatibility/Core/src/AppHostBuilderExtensions.cs | 1 - .../Controls.Sample/ViewModels/CompatibilityViewModel.cs | 3 --- .../samples/Controls.Sample/ViewModels/ControlsViewModel.cs | 2 +- src/Controls/src/Core/IndicatorView.cs | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs index 22691f9f2680..4694e99babad 100644 --- a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs +++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs @@ -91,7 +91,6 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder) handlers.TryAddCompatibilityRenderer(typeof(ListView), typeof(ListViewRenderer)); handlers.TryAddCompatibilityRenderer(typeof(CollectionView), typeof(CollectionViewRenderer)); handlers.TryAddCompatibilityRenderer(typeof(CarouselView), typeof(CarouselViewRenderer)); - //handlers.TryAddCompatibilityRenderer(typeof(IndicatorView), typeof(IndicatorViewRenderer)); handlers.TryAddCompatibilityRenderer(typeof(Path), typeof(PathRenderer)); handlers.TryAddCompatibilityRenderer(typeof(Ellipse), typeof(EllipseRenderer)); handlers.TryAddCompatibilityRenderer(typeof(Line), typeof(LineRenderer)); diff --git a/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs index 3fae660ef17e..be8ab0abed1c 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/CompatibilityViewModel.cs @@ -24,9 +24,6 @@ protected override IEnumerable CreateItems() => new[] new SectionModel(typeof(FramePage), "Frame", "The Frame class derives from ContentView and displays a border, or frame, around its child."), - new SectionModel(typeof(IndicatorViewPage), "IndicatorView", - "IndicatorView displays indicators that represent the number of items in a CarouselView. Set the CarouselView.IndicatorView property to the IndicatorView object to display indicators for the CarouselView."), - new SectionModel(typeof(ListViewPage), "ListView", "ListView derives from ItemsView and displays a scrollable list of selectable data items."), diff --git a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs index 74c0f4a72c11..7ca072a7911e 100644 --- a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs +++ b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs @@ -58,7 +58,7 @@ protected override IEnumerable CreateItems() => new[] "A view that allows the user to select a time."), new SectionModel(typeof(IndicatorPage), "IndicatorView", - "A view that shows dots indicators."), + "IndicatorView displays indicators. It can also represent the number of items in a CarouselView. Set the CarouselView.IndicatorView property to the IndicatorView object to display indicators for the CarouselView."), }; } } \ No newline at end of file diff --git a/src/Controls/src/Core/IndicatorView.cs b/src/Controls/src/Core/IndicatorView.cs index 8698667598a7..7f4f9fb7c4d9 100644 --- a/src/Controls/src/Core/IndicatorView.cs +++ b/src/Controls/src/Core/IndicatorView.cs @@ -118,9 +118,6 @@ protected override SizeRequest OnMeasure(double widthConstraint, double heightCo var padding = DefaultPadding; #if __IOS__ padding += 7; - if (IndicatorsShape == Controls.IndicatorShape.Square) - padding += 2; - #endif var defaultSize = IndicatorSize + padding + padding; var items = GetMaximumVisible();