chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #662 from gehongyan/fix-badge-arrange

Browse Source 
Fix Badge position miscalculation
This commit is contained in:
Dong Bin
2025-04-30 00:48:21 +08:00
committed by GitHub
parent 44984b4f54 35fa4a6c24
commit c878916527
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Ursa/Controls/Badge/Badge.cs
View File

@@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Metadata; using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.Media; using Avalonia.Media;
using Avalonia.Styling; using Avalonia.Styling;
using Ursa.Common; using Ursa.Common;
@@ -65,29 +64,19 @@ public class Badge : HeaderedContentControl
static Badge() static Badge()
{ {
HeaderProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
CornerPositionProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition()); CornerPositionProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
DotProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition()); DotProperty.Changed.AddClassHandler<Badge>((badge, _) => badge.UpdateBadgePosition());
} }
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
_badgeContainer?.RemoveHandler(SizeChangedEvent, OnBadgeSizeChanged);
base.OnApplyTemplate(e); base.OnApplyTemplate(e);
_badgeContainer = e.NameScope.Find<Border>(PART_BadgeContainer); _badgeContainer = e.NameScope.Find<Border>(PART_BadgeContainer);
_badgeContainer?.AddHandler(SizeChangedEvent, OnBadgeSizeChanged);
} }
protected override void OnLoaded(RoutedEventArgs e) private void OnBadgeSizeChanged(object? sender, SizeChangedEventArgs e) => UpdateBadgePosition();
{
base.OnLoaded(e);
UpdateBadgePosition();
}
protected override Size ArrangeOverride(Size finalSize)
{
var size = base.ArrangeOverride(finalSize);
UpdateBadgePosition();
return size;
}
private void UpdateBadgePosition() private void UpdateBadgePosition()
{ {