From 7939c670018478dc587e631c8cb46de2162eac8f Mon Sep 17 00:00:00 2001
From: doudou0720 <98651603+doudou0720@users.noreply.github.com>
Date: Sun, 5 Apr 2026 12:24:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=BF=E6=8D=A2=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=A0=8F=E5=9B=BE=E6=A0=87=E5=BA=93=E4=B8=BA=20H.Noti?=
=?UTF-8?q?fyIcon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
更新所有相关文件和引用，从 Hardcodet.Wpf.TaskbarNotification 迁移到 H.NotifyIcon
调整通知显示方式并添加 ForceCreate 调用确保图标正确显示
Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
---
Ink Canvas/App.xaml | 2 +-
Ink Canvas/App.xaml.cs | 3 ++-
.../Helpers/WindowsNotificationHelper.cs | 7 +++---
Ink Canvas/InkCanvasForClass.csproj | 2 +-
Ink Canvas/MainWindow_cs/MW_Settings.cs | 2 +-
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 2 +-
Ink Canvas/MainWindow_cs/MW_TrayIcon.cs | 2 +-
.../SettingsViews/ThemePanel.xaml.cs | 2 +-
Ink Canvas/packages.lock.json | 25 ++++++++++++++++---
9 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml
index 39bb6117..aa4fc279 100644
--- a/Ink Canvas/App.xaml
+++ b/Ink Canvas/App.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Ink_Canvas"
- xmlns:tb="http://www.hardcodet.net/taskbar"
+ xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
>
diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs
index 787cbc0b..2238c408 100644
--- a/Ink Canvas/App.xaml.cs
+++ b/Ink Canvas/App.xaml.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using Ink_Canvas.Helpers;
using Ink_Canvas.Properties;
using iNKORE.UI.WPF.Modern.Controls;
@@ -1061,6 +1061,7 @@ async void App_Startup(object sender, StartupEventArgs e)
}
_taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
+ _taskbar.ForceCreate();
StartArgs = e.Args;
diff --git a/Ink Canvas/Helpers/WindowsNotificationHelper.cs b/Ink Canvas/Helpers/WindowsNotificationHelper.cs
index 13f15c82..652732eb 100644
--- a/Ink Canvas/Helpers/WindowsNotificationHelper.cs
+++ b/Ink Canvas/Helpers/WindowsNotificationHelper.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using Microsoft.Toolkit.Uwp.Notifications;
using System;
using System.Windows;
@@ -40,10 +40,9 @@ private static void ShowBalloonForWin7(string version)
taskbar.Visibility = Visibility.Visible;
- taskbar.ShowBalloonTip(
+ taskbar.ShowNotification(
"InkCanvasForClass CE",
- $"发现新版本！：{version}",
- BalloonIcon.Info);
+ $"发现新版本！：{version}");
}
catch
{
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 47bdc078..969d8176 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -135,7 +135,7 @@
all
-
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index cedea1b4..7fe730bf 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using Ink_Canvas.Helpers;
using Newtonsoft.Json;
using OSVersionExtension;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 13277e7a..8826afc1 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using Ink_Canvas.Helpers;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
diff --git a/Ink Canvas/MainWindow_cs/MW_TrayIcon.cs b/Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
index 302dfac7..1a537013 100644
--- a/Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Controls;
using System;
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs
index 10fc0f34..6f059470 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs
@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
using iNKORE.UI.WPF.Helpers;
using System;
using System.Collections.Generic;
diff --git a/Ink Canvas/packages.lock.json b/Ink Canvas/packages.lock.json
index 59fa97ac..9442e61a 100644
--- a/Ink Canvas/packages.lock.json
+++ b/Ink Canvas/packages.lock.json
@@ -48,11 +48,15 @@
"Fody": "6.8.2"
}
},
- "Hardcodet.NotifyIcon.Wpf": {
+ "H.NotifyIcon.Wpf": {
"type": "Direct",
- "requested": "[2.0.1, )",
- "resolved": "2.0.1",
- "contentHash": "dtxmeZXzV2GzSm91aZ3hqzgoeVoARSkDPVCYfhVUNyyKBWYxMgNC0EcLiSYxD4Uc4alq/2qb3SmV8DgAENLRLQ=="
+ "requested": "[2.0.131, )",
+ "resolved": "2.0.131",
+ "contentHash": "f71kXNl6PjCqipJ7DQytg1QUBMQ+7j8rF1UyL8UPegymG1G57EYsskdIcf/VmF6JDuts6Dk6F8Hd4ziiz4/3Dw==",
+ "dependencies": {
+ "H.NotifyIcon": "2.0.131",
+ "System.ValueTuple": "4.5.0"
+ }
},
"iNKORE.UI.WPF": {
"type": "Direct",
@@ -185,6 +189,19 @@
"resolved": "6.8.2",
"contentHash": "sjGHrtGS1+kcrv99WXCvujOFBTQp4zCH3ZC9wo2LAtVaJkuLpHghQx3y4k1Q8ZKuDAbEw+HE6ZjPUJQK3ejepQ=="
},
+ "H.GeneratedIcons.System.Drawing": {
+ "type": "Transitive",
+ "resolved": "2.0.131",
+ "contentHash": "QoNGQrhxzG+dQufa4xRjSqihMy5aVVVZqQUt0fLJbwhs7rcM4hpN1qVkZpZEkHsRgrHfFBC/Ursjh8STY/sg7A=="
+ },
+ "H.NotifyIcon": {
+ "type": "Transitive",
+ "resolved": "2.0.131",
+ "contentHash": "mdznQAfcJFehblFoDUvtmdm1Y9+u1eMN1ffORbdYv5EwreMxkCwvdj8qQn3qnUo9EIJ6h5Xdgqey9Nj4us8w7w==",
+ "dependencies": {
+ "H.GeneratedIcons.System.Drawing": "2.0.131"
+ }
+ },
"MdXaml.Plugins": {
"type": "Transitive",
"resolved": "1.27.0",