Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Fix the wrong assignation of margins when the text is assigned #552

Merged
merged 4 commits into from
Nov 17, 2020
Merged

Fix the wrong assignation of margins when the text is assigned #552

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
773fcc4
Fix the wrong assignation of margins when the text is assigned
Nov 13, 2020
f41fe64
do not remove the margins even if there is no text
Nov 14, 2020
00e5854
Merge branch 'main' into BugFix/535_BadgeView_Margins
Rabosa616 Nov 14, 2020
714845a
Merge branch 'main' into BugFix/535_BadgeView_Margins
jsuarezruiz Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions XamarinCommunityToolkit/Views/BadgeView/BadgeView.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,45 +261,58 @@ void UpdateBadgeViewPlacement(bool force = false)
if (placementDone)
return;

const double Padding = 6;
var containerMargin = new Thickness(0);
var contentMargin = new Thickness(0);

var size = Math.Max(BadgeText.Height, BadgeText.Width) + Padding;
if (BadgeIndicatorContainer.IsVisible)
{
const double Padding = 6;
var size = Math.Max(BadgeText.Height, BadgeText.Width) + Padding;
BadgeIndicatorBackground.HeightRequest = size;
var margins = GetMargins(size);
containerMargin = margins.Item1;
contentMargin = margins.Item2;
}

BadgeIndicatorBackground.HeightRequest = size / 1.5;
BadgeIndicatorContainer.Margin = containerMargin;
BadgeContent.Margin = contentMargin;
placementDone = true;
}

Tuple<Thickness, Thickness> GetMargins(double size)
{
double verticalMargin;
double horizontalMargin;

var containerMargin = new Thickness(0);
var contentMargin = new Thickness(0);
switch (BadgePosition)
{
case BadgePosition.TopLeft:
verticalMargin = size / 2;
horizontalMargin = BadgeContent.Width + verticalMargin;
BadgeIndicatorContainer.Margin = new Thickness(0, 0, horizontalMargin, 0);
BadgeContent.Margin = new Thickness(verticalMargin, verticalMargin, 0, 0);
break;
case BadgePosition.TopRight:
verticalMargin = size / 2;
horizontalMargin = BadgeContent.Width - verticalMargin;
BadgeIndicatorContainer.Margin = new Thickness(horizontalMargin, 0, 0, 0);
BadgeContent.Margin = new Thickness(0, verticalMargin, 0, 0);
containerMargin = new Thickness(horizontalMargin, 0, 0, 0);
contentMargin = new Thickness(0, verticalMargin, verticalMargin, 0);
break;
case BadgePosition.BottomLeft:
case BadgePosition.TopLeft:
verticalMargin = size / 2;
containerMargin = new Thickness(0, 0, 0, 0);
contentMargin = new Thickness(verticalMargin, verticalMargin, 0, 0);
break;
case BadgePosition.BottomRight:
verticalMargin = size / 2;
var bottomLeftverticalMargin = BadgeContent.Height - verticalMargin;
BadgeIndicatorContainer.Margin = new Thickness(0, bottomLeftverticalMargin, 0, 0);
containerMargin = new Thickness(0, bottomLeftverticalMargin, 0, 0);
BadgeContent.Margin = new Thickness(verticalMargin, 0, 0, 0);
break;
case BadgePosition.BottomRight:
case BadgePosition.BottomLeft:
verticalMargin = size / 2;
var bottomRightverticalMargin = BadgeContent.Height - verticalMargin;
horizontalMargin = BadgeContent.Width - verticalMargin;
BadgeIndicatorContainer.Margin = new Thickness(horizontalMargin, bottomRightverticalMargin, 0, 0);
BadgeContent.Margin = new Thickness(0, 0, 0, verticalMargin);
containerMargin = new Thickness(horizontalMargin, bottomRightverticalMargin, 0, 0);
contentMargin = new Thickness(0, 0, verticalMargin, 0);
break;
}

placementDone = true;
return new Tuple<Thickness, Thickness>(containerMargin, contentMargin);
}

async Task UpdateVisibilityAsync()
Expand Down