Skip to content

Commit 31d0ca7

Browse files
committed
1 parent 21e90f8 commit 31d0ca7

File tree

1 file changed

+10
-8
lines changed
  • src/WPFDevelopers.Shared/Controls/Badge

1 file changed

+10
-8
lines changed

src/WPFDevelopers.Shared/Controls/Badge/Badge.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,18 +172,20 @@ private static void Parent_Loaded(object sender, RoutedEventArgs e)
172172

173173
private static void CreateBadge(UIElement uIElement, bool isRemove = false)
174174
{
175+
if (uIElement == null) return;
175176
var layer = AdornerLayer.GetAdornerLayer(uIElement);
176177
if (layer == null) return;
177-
if (isRemove && uIElement != null)
178+
var adorners = layer.GetAdorners(uIElement);
179+
if (adorners != null)
178180
{
179-
var adorners = layer.GetAdorners(uIElement);
180-
if (adorners != null)
181-
foreach (var item in adorners)
182-
if (item is Badge container)
183-
layer.Remove(container);
184-
return;
181+
foreach (var item in adorners)
182+
{
183+
if (item is Badge container)
184+
layer.Remove(container);
185+
}
185186
}
186-
187+
if (isRemove)
188+
return;
187189
var value = GetText(uIElement);
188190
var size = GetFontSize(uIElement);
189191
var horizontalOffset = GetHorizontalOffset(uIElement);

0 commit comments

Comments
 (0)