From 309f4a72e6a641a57e49b6981db89db260cc2111 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 1 Dec 2019 21:12:51 +0800 Subject: [PATCH] fixed a bug of NotifyIcon --- .../Controls/Other/NotifyIcon.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs index ca4ad40b..988b72c4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs @@ -636,6 +636,22 @@ namespace HandyControl.Controls } else if (ContextMenu != null) { + if (ContextMenu.Items.Count == 0) return; + + ContextMenu.InvalidateProperty(StyleProperty); + foreach (var item in ContextMenu.Items) + { + if (item is MenuItem menuItem) + { + menuItem.InvalidateProperty(StyleProperty); + } + else + { + var container = ContextMenu.ItemContainerGenerator.ContainerFromItem(item) as MenuItem; + container?.InvalidateProperty(StyleProperty); + } + } + ContextMenu.Placement = PlacementMode.Mouse; ContextMenu.IsOpen = true;