From 285f211f5097fec5e7a94cf2df47edcb591d9615 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Wed, 16 Jul 2025 15:28:36 +0800
Subject: [PATCH 01/33] =?UTF-8?q?add:=E5=A4=87=E4=BB=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Helpers/AutoUpdateHelper.cs | 35 +++++++
Ink Canvas/MainWindow.xaml | 23 +++++
Ink Canvas/MainWindow_cs/MW_Settings.cs | 96 +++++++++++++++++++
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 1 +
Ink Canvas/Resources/Settings.cs | 3 +
5 files changed, 158 insertions(+)
diff --git a/Ink Canvas/Helpers/AutoUpdateHelper.cs b/Ink Canvas/Helpers/AutoUpdateHelper.cs
index 094e2445..9cc250b1 100644
--- a/Ink Canvas/Helpers/AutoUpdateHelper.cs
+++ b/Ink Canvas/Helpers/AutoUpdateHelper.cs
@@ -11,6 +11,7 @@ using System.Windows.Controls;
using System.IO.Compression;
using System.Text;
using System.Collections.Generic;
+using Newtonsoft.Json;
namespace Ink_Canvas.Helpers
{
@@ -417,6 +418,40 @@ namespace Ink_Canvas.Helpers
{
try
{
+ // 在更新前备份设置文件
+ try
+ {
+ // 检查是否开启了自动备份
+ if (MainWindow.Settings.Advanced.IsAutoBackupBeforeUpdate)
+ {
+ // 确保Backups目录存在
+ string backupDir = Path.Combine(App.RootPath, "Backups");
+ if (!Directory.Exists(backupDir))
+ {
+ Directory.CreateDirectory(backupDir);
+ LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
+ }
+
+ // 创建备份文件名（使用当前日期时间和版本号）
+ string backupFileName = $"Settings_BeforeUpdate_v{version}_{DateTime.Now:yyyyMMdd_HHmmss}.json";
+ string backupPath = Path.Combine(backupDir, backupFileName);
+
+ // 序列化当前设置并保存到备份文件
+ string settingsJson = Newtonsoft.Json.JsonConvert.SerializeObject(MainWindow.Settings, Newtonsoft.Json.Formatting.Indented);
+ File.WriteAllText(backupPath, settingsJson);
+
+ LogHelper.WriteLogToFile($"更新前自动备份设置成功: {backupPath}", LogHelper.LogType.Info);
+ }
+ else
+ {
+ LogHelper.WriteLogToFile("更新前自动备份功能已禁用，跳过备份", LogHelper.LogType.Info);
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"更新前自动备份设置时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+
string zipFilePath = Path.Combine(updatesFolderPath, $"InkCanvasForClass.CE.{version}.zip");
LogHelper.WriteLogToFile($"AutoUpdate | Checking for ZIP file: {zipFilePath}");
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 9f43e127..d6b787e8 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -1877,6 +1877,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 3e30aa63..c8840a6b 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -13,6 +13,8 @@ using System.Windows.Media.Imaging;
using System.Windows.Interop;
using Hardcodet.Wpf.TaskbarNotification;
using OSVersionExtension;
+using Microsoft.Win32;
+using System.IO;
namespace Ink_Canvas {
public partial class MainWindow : Window {
@@ -1813,6 +1815,100 @@ namespace Ink_Canvas {
Settings.Advanced.IsSecondConfirmWhenShutdownApp = ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn;
SaveSettingsToFile();
}
+
+ private void ToggleSwitchIsAutoBackupBeforeUpdate_Toggled(object sender, RoutedEventArgs e) {
+ if (!isLoaded) return;
+ Settings.Advanced.IsAutoBackupBeforeUpdate = ToggleSwitchIsAutoBackupBeforeUpdate.IsOn;
+ SaveSettingsToFile();
+ }
+
+ private void BtnManualBackup_Click(object sender, RoutedEventArgs e) {
+ if (!isLoaded) return;
+
+ try {
+ // 确保Backups目录存在
+ string backupDir = Path.Combine(App.RootPath, "Backups");
+ if (!Directory.Exists(backupDir)) {
+ Directory.CreateDirectory(backupDir);
+ LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
+ }
+
+ // 创建备份文件名（使用当前日期时间）
+ string backupFileName = $"Settings_Backup_{DateTime.Now:yyyyMMdd_HHmmss}.json";
+ string backupPath = Path.Combine(backupDir, backupFileName);
+
+ // 序列化当前设置并保存到备份文件
+ string settingsJson = JsonConvert.SerializeObject(Settings, Formatting.Indented);
+ File.WriteAllText(backupPath, settingsJson);
+
+ LogHelper.WriteLogToFile($"成功创建设置备份: {backupPath}", LogHelper.LogType.Info);
+ MessageBox.Show($"设置已成功备份到:\n{backupPath}", "备份成功", MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ catch (Exception ex) {
+ LogHelper.WriteLogToFile($"创建设置备份时出错: {ex.Message}", LogHelper.LogType.Error);
+ MessageBox.Show($"创建备份失败: {ex.Message}", "备份失败", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ }
+
+ private void BtnRestoreBackup_Click(object sender, RoutedEventArgs e) {
+ if (!isLoaded) return;
+
+ try {
+ // 确保Backups目录存在
+ string backupDir = Path.Combine(App.RootPath, "Backups");
+ if (!Directory.Exists(backupDir)) {
+ Directory.CreateDirectory(backupDir);
+ LogHelper.WriteLogToFile($"创建备份目录: {backupDir}", LogHelper.LogType.Info);
+ MessageBox.Show("没有找到备份文件，请先创建备份", "还原失败", MessageBoxButton.OK, MessageBoxImage.Warning);
+ return;
+ }
+
+ // 打开文件选择对话框
+ OpenFileDialog dlg = new OpenFileDialog();
+ dlg.InitialDirectory = backupDir;
+ dlg.Filter = "设置备份文件|Settings_Backup_*.json|所有JSON文件|*.json";
+ dlg.Title = "选择要还原的备份文件";
+
+ if (dlg.ShowDialog() == true) {
+ // 读取备份文件
+ string backupJson = File.ReadAllText(dlg.FileName);
+
+ // 反序列化备份数据
+ Settings backupSettings = JsonConvert.DeserializeObject(backupJson);
+
+ if (backupSettings != null) {
+ // 确认是否要还原
+ if (MessageBox.Show("确定要还原选择的备份文件吗？当前设置将被覆盖。", "确认还原",
+ MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) {
+
+ // 备份当前设置，以防出错
+ string currentSettingsJson = JsonConvert.SerializeObject(Settings, Formatting.Indented);
+ string tempBackupPath = Path.Combine(backupDir, $"Settings_Before_Restore_{DateTime.Now:yyyyMMdd_HHmmss}.json");
+ File.WriteAllText(tempBackupPath, currentSettingsJson);
+
+ // 还原设置
+ Settings = backupSettings;
+
+ // 保存还原后的设置到文件
+ SaveSettingsToFile();
+
+ // 重新加载设置到UI
+ LoadSettings();
+
+ LogHelper.WriteLogToFile($"成功从备份还原设置: {dlg.FileName}", LogHelper.LogType.Info);
+ MessageBox.Show("设置已成功还原，部分设置可能需要重启软件后生效。", "还原成功", MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ }
+ else {
+ MessageBox.Show("无法解析备份文件，文件可能已损坏", "还原失败", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ }
+ }
+ catch (Exception ex) {
+ LogHelper.WriteLogToFile($"还原设置备份时出错: {ex.Message}", LogHelper.LogType.Error);
+ MessageBox.Show($"还原备份失败: {ex.Message}", "还原失败", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ }
#endregion
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 3b182cbb..cf2531a4 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -555,6 +555,7 @@ namespace Ink_Canvas {
ToggleSwitchIsEnableResolutionChangeDetection.IsOn = Settings.Advanced.IsEnableResolutionChangeDetection;
ToggleSwitchIsEnableDPIChangeDetection.IsOn = Settings.Advanced.IsEnableDPIChangeDetection;
ToggleSwitchIsEnableAvoidFullScreenHelper.IsOn = Settings.Advanced.IsEnableAvoidFullScreenHelper;
+ ToggleSwitchIsAutoBackupBeforeUpdate.IsOn = Settings.Advanced.IsAutoBackupBeforeUpdate;
if (Settings.Advanced.IsEnableFullScreenHelper) {
FullScreenHelper.MarkFullscreenWindowTaskbarList(new WindowInteropHelper(this).Handle, true);
}
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 7abe8f82..da490d31 100644
--- a/Ink Canvas/Resources/Settings.cs
+++ b/Ink Canvas/Resources/Settings.cs
@@ -418,6 +418,9 @@ namespace Ink_Canvas
[JsonProperty("isEnableAvoidFullScreenHelper")]
public bool IsEnableAvoidFullScreenHelper { get; set; } = false;
+
+ [JsonProperty("isAutoBackupBeforeUpdate")]
+ public bool IsAutoBackupBeforeUpdate { get; set; } = true;
}
public class InkToShape
From 7ac3a22fa6c86c7b4ceadc4adae2b1c3705f3ff3 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Thu, 17 Jul 2025 22:30:12 +0800
Subject: [PATCH 02/33] =?UTF-8?q?improve:=E6=8F=92=E4=BB=B6=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Helpers/Plugins/ICCPPPluginAdapter.cs | 169 +++++++++++++++
Ink Canvas/Helpers/Plugins/PluginManager.cs | 196 +++++++++---------
.../Windows/PluginSettingsWindow.xaml.cs | 9 +-
3 files changed, 271 insertions(+), 103 deletions(-)
create mode 100644 Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
diff --git a/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs b/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
new file mode 100644
index 00000000..1d28d50f
--- /dev/null
+++ b/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
@@ -0,0 +1,169 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+namespace Ink_Canvas.Helpers.Plugins
+{
+ ///
+ /// ICCPP 插件适配器，用于加载和管理 .iccpp 格式的插件
+ ///
+ public class ICCPPPluginAdapter : PluginBase
+ {
+ private readonly byte[] _pluginData;
+ private readonly string _pluginPath;
+ private readonly string _pluginName;
+ private readonly Version _pluginVersion;
+ private bool _isInitialized = false;
+
+ ///
+ /// 创建 ICCPP 插件适配器
+ ///
+ /// 插件文件路径
+ /// 插件文件数据
+ public ICCPPPluginAdapter(string pluginPath, byte[] pluginData)
+ {
+ _pluginPath = pluginPath;
+ _pluginData = pluginData;
+ PluginPath = pluginPath;
+
+ // 从文件名获取插件名称
+ _pluginName = Path.GetFileNameWithoutExtension(pluginPath);
+ _pluginVersion = new Version(1, 0, 0); // 默认版本
+
+ // 尝试从插件数据中读取更多信息
+ TryReadPluginMetadata();
+ }
+
+ ///
+ /// 尝试从插件数据中读取元数据
+ ///
+ private void TryReadPluginMetadata()
+ {
+ try
+ {
+ // 这里可以根据 .iccpp 文件的实际格式解析元数据
+ // 例如，如果文件有特定的头部结构，可以在这里解析
+
+ // 示例：如果前100字节包含元数据
+ if (_pluginData.Length > 100)
+ {
+ // 解析元数据的代码...
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"解析插件 {_pluginName} 元数据时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ #region IPlugin 接口实现
+
+ ///
+ /// 插件名称
+ ///
+ public override string Name => _pluginName;
+
+ ///
+ /// 插件描述
+ ///
+ public override string Description => $"{_pluginName} (ICCPP 格式插件)";
+
+ ///
+ /// 插件版本
+ ///
+ public override Version Version => _pluginVersion;
+
+ ///
+ /// 插件作者
+ ///
+ public override string Author => "未知";
+
+ ///
+ /// 是否为内置插件
+ ///
+ public override bool IsBuiltIn => false;
+
+ ///
+ /// 初始化插件
+ ///
+ public override void Initialize()
+ {
+ if (_isInitialized) return;
+
+ try
+ {
+ // 这里可以添加 .iccpp 插件的初始化逻辑
+ // 例如，根据文件格式加载特定资源
+
+ LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化", LogHelper.LogType.Info);
+ _isInitialized = true;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"初始化 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ ///
+ /// 启用插件
+ ///
+ public override void Enable()
+ {
+ if (IsEnabled) return;
+
+ try
+ {
+ // 这里可以添加 .iccpp 插件的启用逻辑
+ // 例如，加载动态库、注册事件等
+
+ base.Enable(); // 设置启用状态并触发事件
+ LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用", LogHelper.LogType.Info);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"启用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ ///
+ /// 禁用插件
+ ///
+ public override void Disable()
+ {
+ if (!IsEnabled) return;
+
+ try
+ {
+ // 这里可以添加 .iccpp 插件的禁用逻辑
+ // 例如，卸载动态库、注销事件等
+
+ base.Disable(); // 设置禁用状态并触发事件
+ LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用", LogHelper.LogType.Info);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"禁用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ ///
+ /// 清理插件资源
+ ///
+ public override void Cleanup()
+ {
+ try
+ {
+ // 这里可以添加 .iccpp 插件的清理逻辑
+ // 例如，释放资源等
+
+ LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源", LogHelper.LogType.Info);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"清理 ICCPP 插件 {Name} 资源时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/Ink Canvas/Helpers/Plugins/PluginManager.cs b/Ink Canvas/Helpers/Plugins/PluginManager.cs
index c43e0283..2055cc68 100644
--- a/Ink Canvas/Helpers/Plugins/PluginManager.cs
+++ b/Ink Canvas/Helpers/Plugins/PluginManager.cs
@@ -195,8 +195,12 @@ namespace Ink_Canvas.Helpers.Plugins
return;
}
- // 获取所有插件文件
- var pluginFiles = Directory.GetFiles(PluginsDirectory, "*.iccpp", SearchOption.TopDirectoryOnly);
+ // 获取所有插件文件（支持 .iccpp 和 .dll 格式）
+ var pluginFiles = Directory.GetFiles(PluginsDirectory, "*.iccpp", SearchOption.TopDirectoryOnly)
+ .Concat(Directory.GetFiles(PluginsDirectory, "*.dll", SearchOption.TopDirectoryOnly))
+ .ToArray();
+
+ LogHelper.WriteLogToFile($"发现 {pluginFiles.Length} 个外部插件文件", LogHelper.LogType.Info);
foreach (var pluginFile in pluginFiles)
{
@@ -222,6 +226,14 @@ namespace Ink_Canvas.Helpers.Plugins
string fileHash = CalculateFileHash(pluginPath);
_pluginHashes[pluginPath] = fileHash;
+ // 检查文件扩展名
+ string extension = Path.GetExtension(pluginPath).ToLowerInvariant();
+ if (extension == ".iccpp")
+ {
+ // 创建 ICCPP 插件适配器
+ return CreateICCPPPluginAdapter(pluginPath);
+ }
+
// 加载插件程序集
Assembly pluginAssembly = LoadPluginAssembly(pluginPath);
if (pluginAssembly == null) return null;
@@ -253,16 +265,48 @@ namespace Ink_Canvas.Helpers.Plugins
}
catch (Exception ex)
{
- LogHelper.WriteLogToFile($"实例化插件 {pluginType.Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"实例化插件类型 {pluginType.Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
}
}
+
+ LogHelper.WriteLogToFile($"在程序集 {Path.GetFileName(pluginPath)} 中未找到有效的插件类型", LogHelper.LogType.Warning);
+ return null;
}
catch (Exception ex)
{
- LogHelper.WriteLogToFile($"加载插件 {Path.GetFileName(pluginPath)} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"加载外部插件 {Path.GetFileName(pluginPath)} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ return null;
+ }
+ }
+
+ ///
+ /// 创建 ICCPP 插件适配器
+ ///
+ /// 插件文件路径
+ /// 适配的插件实例
+ private IPlugin CreateICCPPPluginAdapter(string pluginPath)
+ {
+ try
+ {
+ // 读取插件文件内容
+ byte[] pluginData = File.ReadAllBytes(pluginPath);
+
+ // 创建适配器插件实例
+ var pluginAdapter = new ICCPPPluginAdapter(pluginPath, pluginData);
+
+ // 添加到插件列表
+ Plugins.Add(pluginAdapter);
+
+ LogHelper.WriteLogToFile($"已创建 ICCPP 插件适配器: {pluginAdapter.Name} 来自 {Path.GetFileName(pluginPath)}",
+ LogHelper.LogType.Info);
+
+ return pluginAdapter;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"创建 ICCPP 插件适配器时出错: {ex.Message}", LogHelper.LogType.Error);
+ return null;
}
-
- return null;
}
///
@@ -280,7 +324,7 @@ namespace Ink_Canvas.Helpers.Plugins
return loadedAssembly;
}
- // 加载程序集
+ // 直接加载程序集
Assembly pluginAssembly = Assembly.LoadFrom(pluginPath);
_loadedAssemblies[pluginPath] = pluginAssembly;
@@ -483,117 +527,63 @@ namespace Ink_Canvas.Helpers.Plugins
{
try
{
- LogHelper.WriteLogToFile($"开始重载插件: {plugin.Name}", LogHelper.LogType.Info);
-
- // 记录插件状态和信息
- bool wasEnabled = plugin.IsEnabled;
string pluginPath = plugin.PluginPath;
- string pluginTypeName = plugin.GetType().FullName;
-
- // 记录日志，方便排查问题
- LogHelper.WriteLogToFile($"重载前插件状态 - 类型: {pluginTypeName}, 状态: {(wasEnabled ? "启用" : "禁用")}", LogHelper.LogType.Info);
-
- // 如果配置中有该插件的状态，记录配置中的状态
- if (PluginStates.TryGetValue(pluginTypeName, out bool currentConfigState))
+ if (string.IsNullOrEmpty(pluginPath) || !File.Exists(pluginPath))
{
- LogHelper.WriteLogToFile($"配置中插件状态: {(currentConfigState ? "启用" : "禁用")}", LogHelper.LogType.Info);
+ LogHelper.WriteLogToFile($"无法重新加载插件 {plugin.Name}: 插件文件不存在", LogHelper.LogType.Error);
+ return;
}
- // 卸载插件，但不从PluginStates中移除状态信息
- UnloadPlugin(plugin);
+ LogHelper.WriteLogToFile($"开始热重载插件: {plugin.Name} ({Path.GetFileName(pluginPath)})", LogHelper.LogType.Info);
- // 清除程序集缓存，确保加载最新版本
- _loadedAssemblies.Remove(pluginPath);
+ // 保存插件的当前状态
+ bool wasEnabled = plugin.IsEnabled;
+ string pluginTypeName = plugin.GetType().FullName;
+
+ // 卸载插件
+ UnloadPlugin(plugin, false);
+
+ // 从加载缓存中移除
+ if (_loadedAssemblies.ContainsKey(pluginPath))
+ {
+ _loadedAssemblies.Remove(pluginPath);
+ }
+
+ // 计算新的文件哈希
+ string newHash = CalculateFileHash(pluginPath);
+ _pluginHashes[pluginPath] = newHash;
// 重新加载插件
IPlugin newPlugin = LoadExternalPlugin(pluginPath);
if (newPlugin != null)
{
- // 更新配置中的插件状态
- string newPluginTypeName = newPlugin.GetType().FullName;
+ // 恢复插件状态
+ if (wasEnabled)
+ {
+ newPlugin.Enable();
+ }
- // 如果插件类型名称变化，需要更新配置
- if (newPluginTypeName != pluginTypeName && PluginStates.ContainsKey(pluginTypeName))
+ // 更新配置（如果类型名称变化）
+ string newPluginTypeName = newPlugin.GetType().FullName;
+ if (pluginTypeName != newPluginTypeName && PluginStates.ContainsKey(pluginTypeName))
{
bool state = PluginStates[pluginTypeName];
PluginStates.Remove(pluginTypeName);
PluginStates[newPluginTypeName] = state;
- LogHelper.WriteLogToFile($"插件类型名称已变更: {pluginTypeName} -> {newPluginTypeName}, 已更新配置", LogHelper.LogType.Info);
+ _configDirty = true;
+ SaveConfig();
}
- // 应用正确的状态
- bool shouldBeEnabled = false;
- if (PluginStates.TryGetValue(newPluginTypeName, out bool storedConfigState))
- {
- shouldBeEnabled = storedConfigState;
- LogHelper.WriteLogToFile($"从配置获取插件状态: {(shouldBeEnabled ? "启用" : "禁用")}", LogHelper.LogType.Info);
- }
- else
- {
- shouldBeEnabled = wasEnabled;
- PluginStates[newPluginTypeName] = shouldBeEnabled;
- LogHelper.WriteLogToFile($"使用之前的状态: {(shouldBeEnabled ? "启用" : "禁用")}", LogHelper.LogType.Info);
- }
+ LogHelper.WriteLogToFile($"插件 {newPlugin.Name} v{newPlugin.Version} 热重载成功", LogHelper.LogType.Info);
- // 获取重载后的实际状态
- bool currentState = newPlugin is PluginBase pluginBaseState && pluginBaseState.IsEnabled;
- LogHelper.WriteLogToFile($"重载后实际状态: {(currentState ? "启用" : "禁用")}", LogHelper.LogType.Info);
-
- // 根据应该启用的状态启用或禁用插件
- if (shouldBeEnabled != currentState)
- {
- if (shouldBeEnabled)
- {
- newPlugin.Enable();
- LogHelper.WriteLogToFile($"插件 {newPlugin.Name} 已重载并启用", LogHelper.LogType.Info);
- }
- else
- {
- newPlugin.Disable();
- LogHelper.WriteLogToFile($"插件 {newPlugin.Name} 已重载并禁用", LogHelper.LogType.Info);
- }
-
- // 检查状态是否正确应用
- currentState = newPlugin is PluginBase reloadedBase && reloadedBase.IsEnabled;
- LogHelper.WriteLogToFile($"应用状态后实际状态: {(currentState ? "启用" : "禁用")}", LogHelper.LogType.Info);
-
- if (currentState != shouldBeEnabled)
- {
- LogHelper.WriteLogToFile($"警告: 插件状态应用失败，目标状态: {(shouldBeEnabled ? "启用" : "禁用")}, 实际状态: {(currentState ? "启用" : "禁用")}", LogHelper.LogType.Warning);
- }
- }
- else
- {
- LogHelper.WriteLogToFile($"插件 {newPlugin.Name} 已重载并保持{(shouldBeEnabled ? "启用" : "禁用")}状态", LogHelper.LogType.Info);
- }
-
- // 保存插件设置
- if (newPlugin is PluginBase pluginBaseInstance)
- {
- try
- {
- // 保存插件设置（与启用状态无关）
- pluginBaseInstance.SavePluginSettings();
- LogHelper.WriteLogToFile($"已保存插件 {newPlugin.Name} 设置", LogHelper.LogType.Info);
- }
- catch (Exception ex)
- {
- LogHelper.WriteLogToFile($"保存插件 {newPlugin.Name} 设置时出错: {ex.Message}", LogHelper.LogType.Error);
- }
- }
-
- // 立即保存配置
- LogHelper.WriteLogToFile($"重载后保存插件配置...", LogHelper.LogType.Info);
- SaveConfig();
+ // 通知UI刷新
+ NotifyUIRefresh();
}
else
{
- LogHelper.WriteLogToFile($"插件 {plugin.Name} 重载失败: 无法加载新插件", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"插件 {plugin.Name} 热重载失败", LogHelper.LogType.Error);
}
-
- // 更新UI
- NotifyUIRefresh();
}
catch (Exception ex)
{
@@ -605,11 +595,14 @@ namespace Ink_Canvas.Helpers.Plugins
/// 卸载插件
///
/// 要卸载的插件
- /// 是否从配置中移除插件状态（默认为false）
+ /// 是否从配置中移除
public void UnloadPlugin(IPlugin plugin, bool removeFromConfig = false)
{
try
{
+ // 保存插件名称，以便在卸载后使用
+ string pluginName = plugin.Name;
+
// 如果插件已启用，先禁用它
if (plugin is PluginBase pluginBase && pluginBase.IsEnabled)
{
@@ -633,11 +626,11 @@ namespace Ink_Canvas.Helpers.Plugins
}
}
- LogHelper.WriteLogToFile($"已卸载插件: {plugin.Name}", LogHelper.LogType.Info);
+ LogHelper.WriteLogToFile($"已卸载插件: {pluginName}", LogHelper.LogType.Info);
}
catch (Exception ex)
{
- LogHelper.WriteLogToFile($"卸载插件 {plugin.Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"卸载插件时出错: {ex.Message}", LogHelper.LogType.Error);
}
}
@@ -656,6 +649,9 @@ namespace Ink_Canvas.Helpers.Plugins
return false;
}
+ // 保存插件名称，以便在删除后使用
+ string pluginName = plugin.Name;
+
// 获取插件路径
string pluginPath = null;
if (plugin is PluginBase pluginBase)
@@ -681,12 +677,12 @@ namespace Ink_Canvas.Helpers.Plugins
// 保存配置
SaveConfig();
- LogHelper.WriteLogToFile($"已删除插件: {plugin.Name}", LogHelper.LogType.Info);
+ LogHelper.WriteLogToFile($"已删除插件: {pluginName}", LogHelper.LogType.Info);
return true;
}
catch (Exception ex)
{
- LogHelper.WriteLogToFile($"删除插件 {plugin.Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
+ LogHelper.WriteLogToFile($"删除插件时出错: {ex.Message}", LogHelper.LogType.Error);
return false;
}
}
diff --git a/Ink Canvas/Windows/PluginSettingsWindow.xaml.cs b/Ink Canvas/Windows/PluginSettingsWindow.xaml.cs
index 55b2b927..c43c7d3c 100644
--- a/Ink Canvas/Windows/PluginSettingsWindow.xaml.cs
+++ b/Ink Canvas/Windows/PluginSettingsWindow.xaml.cs
@@ -292,9 +292,12 @@ namespace Ink_Canvas.Windows
return;
}
+ // 保存插件名称，以便在删除后使用
+ string pluginName = SelectedPlugin.Name;
+
// 确认删除
MessageBoxResult result = MessageBox.Show(
- $"确定要删除插件 {SelectedPlugin.Name} 吗？\n此操作将永久删除插件文件，无法恢复。",
+ $"确定要删除插件 {pluginName} 吗？\n此操作将永久删除插件文件，无法恢复。",
"删除确认",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
@@ -315,11 +318,11 @@ namespace Ink_Canvas.Windows
PluginListView.SelectedIndex = 0;
}
- MessageBox.Show($"插件 {SelectedPlugin.Name} 已成功删除。", "成功", MessageBoxButton.OK, MessageBoxImage.Information);
+ MessageBox.Show($"插件 {pluginName} 已成功删除。", "成功", MessageBoxButton.OK, MessageBoxImage.Information);
}
else
{
- MessageBox.Show("删除插件失败，请稍后重试。", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+ MessageBox.Show($"删除插件 {pluginName} 失败，请稍后重试。", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
}
From 2485958f6eac8bb1a3890a082cd70fcf29e10162 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:38:32 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E6=92=A4=E9=94=80Commit=203645906?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index a53aa0f1..e64c96fe 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -514,6 +514,8 @@ namespace Ink_Canvas {
Thread.Sleep(100);
Application.Current.Dispatcher.Invoke(() => { ViewboxFloatingBarMarginAnimation(60); });
})).Start();
+
+ HideSubPanels();
if (GridTransparencyFakeBackground.Background == Brushes.Transparent)
{
@@ -527,11 +529,6 @@ namespace Ink_Canvas {
}
BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
- HideSubPanels();
- }
- else
- {
- HideSubPanels();
}
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动关闭多指书写、开启双指移动
From 17eaf34500db5b652676f4d7cd266e166291fd37 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:47:41 +0800
Subject: [PATCH 04/33] =?UTF-8?q?=E6=92=A4=E9=94=80=20Commit=20b46cbcc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 830c288d..547f891c 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -305,11 +305,17 @@ namespace Ink_Canvas {
}
else {
isLastTouchEraser = false;
+<<<<<<< HEAD
currentPalmEraserShape = null;
// 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
// 修复触屏状态下几何绘制功能不可用的问题：在几何绘制模式下不应该因为forceEraser而直接返回
if (forceEraser && drawingShapeMode == 0) return;
+=======
+ inkCanvas.EraserShape =
+ forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
+ if (forceEraser) return;
+>>>>>>> parent of b46cbcc (fix:issue #23)
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
}
From 8ab60ad000c5b1d248bfbc3241df81bbbd7ab3c6 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:49:00 +0800
Subject: [PATCH 05/33] =?UTF-8?q?=E6=92=A4=E9=94=80=20Commit=20ab88c34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml.cs | 11 ++++++++++
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 2 --
...vasForClass.csproj.AssemblyReference.cache | Bin 0 -> 34904 bytes
.../InkCanvasForClass_MarkupCompile.cache | 20 ++++++++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644 Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
create mode 100644 Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index d4e7bf43..1c23aaf3 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -160,9 +160,20 @@ namespace Ink_Canvas {
private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
var inkCanvas1 = sender as InkCanvas;
if (inkCanvas1 == null) return;
+<<<<<<< HEAD
// 使用辅助方法设置光标
SetCursorBasedOnEditingMode(inkCanvas1);
+=======
+ if (Settings.Canvas.IsShowCursor) {
+ if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
+ inkCanvas1.ForceCursor = true;
+ else
+ inkCanvas1.ForceCursor = false;
+ } else {
+ inkCanvas1.ForceCursor = false;
+ }
+>>>>>>> parent of ab88c34 (fix:issue #23)
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
}
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 547f891c..acbf9419 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -74,8 +74,6 @@ namespace Ink_Canvas {
}
else {
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
- // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
- inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
inkCanvas.EditingMode = InkCanvasEditingMode.None;
}
}
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..0b5fd9240bff6bb31501ffff0de21a426c46b473
GIT binary patch
literal 34904
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
Date: Fri, 18 Jul 2025 11:50:44 +0800
Subject: [PATCH 06/33] =?UTF-8?q?=E6=92=A4=E9=94=80=20Commit=20ab88c34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml.cs | 3 ---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 3 ---
...vasForClass.csproj.AssemblyReference.cache | Bin 34904 -> 35087 bytes
.../InkCanvasForClass_MarkupCompile.cache | 12 ++++++------
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 1c23aaf3..9e71192e 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -160,11 +160,9 @@ namespace Ink_Canvas {
private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
var inkCanvas1 = sender as InkCanvas;
if (inkCanvas1 == null) return;
-<<<<<<< HEAD
// 使用辅助方法设置光标
SetCursorBasedOnEditingMode(inkCanvas1);
-=======
if (Settings.Canvas.IsShowCursor) {
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
inkCanvas1.ForceCursor = true;
@@ -173,7 +171,6 @@ namespace Ink_Canvas {
} else {
inkCanvas1.ForceCursor = false;
}
->>>>>>> parent of ab88c34 (fix:issue #23)
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
}
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index acbf9419..e5c26dfa 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -303,17 +303,14 @@ namespace Ink_Canvas {
}
else {
isLastTouchEraser = false;
-<<<<<<< HEAD
currentPalmEraserShape = null;
// 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
// 修复触屏状态下几何绘制功能不可用的问题：在几何绘制模式下不应该因为forceEraser而直接返回
if (forceEraser && drawingShapeMode == 0) return;
-=======
inkCanvas.EraserShape =
forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
if (forceEraser) return;
->>>>>>> parent of b46cbcc (fix:issue #23)
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
}
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 0b5fd9240bff6bb31501ffff0de21a426c46b473..93610cbd1b7b1ad281b4eb72a3828e09cd532b79 100644
GIT binary patch
delta 406
zcmcaHfvJBI(}Z)3rW4PLX(i|9=9cDVmQ==g=4C55C+3wU7RPuxI_DRq>ZRo5FfuYQ
zF#L)v+`nbpWI;wFYew6&%$!s!eSLjbD}7IAX9Z_hD5a2_n3<;!H%=d6oIb?3$%^5c
zn=={Zm?oYR*MqA=wbmy;F(tJKZgEc&$l|*klkYRhPS#@-wPmy?%X)~hAO}p&WbE6#
zg=IP;qZ!cm+BlpMo|)$s0e3~fUalfT6)y4ODFcse`lI=jYr=4C55C+3wU7RRJy7MH|$Iy&bUrRt^RRp$$bTU7q5hKH7#d6ij3t0L#8#7H{WVD=kUd#ZeAwKzuDXB$pV-in-jJeA(
zS(;gPvJRst#IVf^SX7x9Er15;;xs5cGtVsoZcg_Huyfeil_qPl2qHO2m*Y_b05!Ep
AoB#j-
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
index c6334c11..0335c48f 100644
--- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
+++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache
@@ -4,17 +4,17 @@
winexe
C#
.cs
-E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\
+E:\ICC CE\ICC CE main\community\Ink Canvas\obj\Debug\net472\
Ink_Canvas
none
false
TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER
-E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
-13173459795
+E:\ICC CE\ICC CE main\community\Ink Canvas\App.xaml
+201780504554
-56-1167124909
-46-47806484
-MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
+72875899768
+46-932173576
+Helpers\Plugins\BuiltIn\SuperLauncher\LauncherSettingsControl.xaml;Helpers\Plugins\BuiltIn\SuperLauncher\LauncherWindow.xaml;MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\AddCustomIconWindow.xaml;Windows\AddPickNameBackgroundWindow.xaml;Windows\CountdownTimerWindow.xaml;Windows\CustomIconWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\ManagePickNameBackgroundsWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\PluginSettingsWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
False
From 938ca648f1bcea64bce8a6001b3cafb01fe51216 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 11:53:55 +0800
Subject: [PATCH 07/33] =?UTF-8?q?=E6=92=A4=E9=94=80=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index e5c26dfa..9ffa811d 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -74,6 +74,8 @@ namespace Ink_Canvas {
}
else {
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
+ // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
+ inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
inkCanvas.EditingMode = InkCanvasEditingMode.None;
}
}
From 4feec82b03dc45e0aa217338df28ba3c0ec71572 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 16:12:04 +0800
Subject: [PATCH 08/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 2 +-
Ink Canvas/MainWindow.xaml.cs | 53 ++--
Ink Canvas/MainWindow_cs/MW_BoardIcons.cs | 30 +-
Ink Canvas/MainWindow_cs/MW_Colors.cs | 20 --
.../MainWindow_cs/MW_FloatingBarIcons.cs | 99 +++----
.../MainWindow_cs/MW_SelectionGestures.cs | 19 ++
Ink Canvas/MainWindow_cs/MW_Settings.cs | 12 +-
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 264 +++++-------------
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 117 ++------
9 files changed, 191 insertions(+), 425 deletions(-)
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index d6b787e8..67b01802 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -2869,7 +2869,7 @@
CheckIsDrawingShapesInMultiTouchMode() {
@@ -131,323 +131,232 @@ namespace Ink_Canvas {
private async void BtnDrawLine_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- if (lastMouseDownSender == sender) {
- forceEraser = true;
- drawingShapeMode = 1;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- CancelSingleFingerDragMode();
- }
- else {
- // 即使不是长按，也设置必要的绘图状态
- forceEraser = true;
- drawingShapeMode = 1;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- isLongPressSelected = true; // 设置为选中状态，避免抬笔后切换回笔模式
- }
-
+ EnterShapeDrawingMode(1);
+ CancelSingleFingerDragMode();
lastMouseDownSender = null;
if (isLongPressSelected) {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawLine.BeginAnimation(OpacityProperty, dA);
}
-
DrawShapePromptToPen();
}
private async void BtnDrawDashedLine_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- if (lastMouseDownSender == sender) {
- forceEraser = true;
- drawingShapeMode = 8;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- CancelSingleFingerDragMode();
- }
-
+ EnterShapeDrawingMode(8);
+ CancelSingleFingerDragMode();
lastMouseDownSender = null;
if (isLongPressSelected) {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawDashedLine.BeginAnimation(OpacityProperty, dA);
}
-
DrawShapePromptToPen();
}
private async void BtnDrawDotLine_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- if (lastMouseDownSender == sender) {
- forceEraser = true;
- drawingShapeMode = 18;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- CancelSingleFingerDragMode();
- }
-
+ EnterShapeDrawingMode(18);
+ CancelSingleFingerDragMode();
lastMouseDownSender = null;
if (isLongPressSelected) {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawDotLine.BeginAnimation(OpacityProperty, dA);
}
-
DrawShapePromptToPen();
}
private async void BtnDrawArrow_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- if (lastMouseDownSender == sender) {
- forceEraser = true;
- drawingShapeMode = 2;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- CancelSingleFingerDragMode();
- }
- else {
- // 即使不是长按，也设置必要的绘图状态
- forceEraser = true;
- drawingShapeMode = 2;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- isLongPressSelected = true; // 设置为选中状态，避免抬笔后切换回笔模式
- }
-
+ EnterShapeDrawingMode(2);
+ CancelSingleFingerDragMode();
lastMouseDownSender = null;
if (isLongPressSelected) {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawArrow.BeginAnimation(OpacityProperty, dA);
}
-
DrawShapePromptToPen();
}
private async void BtnDrawParallelLine_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- if (lastMouseDownSender == sender) {
- forceEraser = true;
- drawingShapeMode = 15;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- CancelSingleFingerDragMode();
- }
-
+ EnterShapeDrawingMode(15);
+ CancelSingleFingerDragMode();
lastMouseDownSender = null;
if (isLongPressSelected) {
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawParallelLine.BeginAnimation(OpacityProperty, dA);
}
-
DrawShapePromptToPen();
}
private async void BtnDrawCoordinate1_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 11;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(11);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCoordinate2_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 12;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(12);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCoordinate3_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 13;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(13);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCoordinate4_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 14;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(14);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCoordinate5_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 17;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(17);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawRectangle_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 3;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
- isLongPressSelected = true; // 设置为选中状态，避免抬笔后切换回笔模式
+ EnterShapeDrawingMode(3);
CancelSingleFingerDragMode();
+ isLongPressSelected = true; // 设置为选中状态，避免抬笔后切换回笔模式
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawRectangleCenter_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 19;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(19);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawEllipse_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 4;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(4);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCircle_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 5;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(5);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCenterEllipse_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 16;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(16);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCenterEllipseWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 23;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(23);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawDashedCircle_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 10;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(10);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawHyperbola_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 24;
+ EnterShapeDrawingMode(24);
drawMultiStepShapeCurrentStep = 0;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawHyperbolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 25;
+ EnterShapeDrawingMode(25);
drawMultiStepShapeCurrentStep = 0;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawParabola1_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 20;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(20);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawParabolaWithFocalPoint_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 22;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(22);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawParabola2_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 21;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(21);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCylinder_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 6;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(6);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCone_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 7;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
+ EnterShapeDrawingMode(7);
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
private async void BtnDrawCuboid_Click(object sender, MouseButtonEventArgs e) {
await CheckIsDrawingShapesInMultiTouchMode();
- forceEraser = true;
- drawingShapeMode = 9;
+ EnterShapeDrawingMode(9);
isFirstTouchCuboid = true;
CuboidFrontRectIniP = new Point();
CuboidFrontRectEndP = new Point();
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
- inkCanvas.IsManipulationEnabled = true;
CancelSingleFingerDragMode();
+ lastMouseDownSender = null;
DrawShapePromptToPen();
}
@@ -460,20 +369,17 @@ namespace Ink_Canvas {
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
return;
}
-
if (isSingleFingerDragMode) return;
- // 处理形状绘制模式
+ // 处理几何绘制模式
if (drawingShapeMode != 0) {
if (isLastTouchEraser) return;
//EraserContainer.Background = null;
//ImageEraser.Visibility = Visibility.Visible;
-
// 修复触屏状态下几何绘制功能不可用的问题
// 在几何绘制模式下，即使isWaitUntilNextTouchDown为true，也应该处理触摸移动事件
// 只有当多点触控时才需要等待下一次触摸
if (isWaitUntilNextTouchDown && dec.Count > 1) return;
-
if (dec.Count > 1) {
isWaitUntilNextTouchDown = true;
try {
@@ -485,19 +391,19 @@ namespace Ink_Canvas {
}
return;
}
-
// 在几何绘制模式下，确保处理单点触控的移动事件
Point touchPoint = e.GetTouchPoint(inkCanvas).Position;
MouseTouchMove(touchPoint);
return; // 处理完几何绘制后直接返回，不执行后面的代码
}
- // 触摸移动时保持自定义光标显示
- if (inkCanvas.EditingMode != InkCanvasEditingMode.None)
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
-
-
- MouseTouchMove(e.GetTouchPoint(inkCanvas).Position);
+ // 其它模式下，允许橡皮、套索、批注等正常工作，不覆盖EditingMode
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint ||
+ inkCanvas.EditingMode == InkCanvasEditingMode.Select ||
+ inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+ // 允许正常橡皮、套索、批注
+ return;
+ }
}
private int drawMultiStepShapeCurrentStep = 0; //多笔完成的图形 当前所处在的笔画
@@ -1317,42 +1223,6 @@ namespace Ink_Canvas {
private Point CuboidFrontRectIniP = new Point();
private Point CuboidFrontRectEndP = new Point();
- private void Main_Grid_TouchUp(object sender, TouchEventArgs e) {
-
- inkCanvas.ReleaseAllTouchCaptures();
- ViewboxFloatingBar.IsHitTestVisible = true;
- BlackboardUIGridForInkReplay.IsHitTestVisible = true;
-
- // 在几何绘制模式下，确保正确处理触摸抬起事件
- if (drawingShapeMode != 0) {
- // 如果是几何绘制模式，确保将临时绘制的图形添加到永久图形中
- if (lastTempStroke != null) {
- // 将临时笔画添加到历史记录中
- var strokes = new StrokeCollection();
- strokes.Add(lastTempStroke);
- timeMachine.CommitStrokeUserInputHistory(strokes);
- // 清除临时笔画引用，以便下次绘制
- lastTempStroke = null;
- }
-
- if (lastTempStrokeCollection != null && lastTempStrokeCollection.Count > 0) {
- // 将临时笔画集合添加到历史记录中
- timeMachine.CommitStrokeUserInputHistory(lastTempStrokeCollection);
- // 清除临时笔画集合引用，以便下次绘制
- lastTempStrokeCollection = new StrokeCollection();
- }
-
- // 如果不是长按选中的状态，则需要在抬起手指后重置isWaitUntilNextTouchDown
- if (!isLongPressSelected && dec.Count == 0) {
- isWaitUntilNextTouchDown = false;
- }
- }
-
- inkCanvas_MouseUp(sender, null);
- // 修改此处逻辑，在长按选择图形模式下保持isWaitUntilNextTouchDown
- if (dec.Count == 0 && !isLongPressSelected) isWaitUntilNextTouchDown = false;
- }
-
private Stroke lastTempStroke = null;
private StrokeCollection lastTempStrokeCollection = new StrokeCollection();
@@ -1735,5 +1605,15 @@ namespace Ink_Canvas {
}
}
}
+
+ // 在MainWindow类中添加：
+ private void EnterShapeDrawingMode(int mode) {
+ forceEraser = true;
+ forcePointEraser = false;
+ isLastTouchEraser = false;
+ drawingShapeMode = mode;
+ inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ SetCursorBasedOnEditingMode(inkCanvas);
+ }
}
}
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 9ffa811d..b76cac43 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -15,6 +15,11 @@ namespace Ink_Canvas {
#region Multi-Touch
private bool isInMultiTouchMode = false;
+ private InkCanvasEditingMode prePalmEraserEditingMode = InkCanvasEditingMode.Ink;
+ private List dec = new List();
+ private bool isSingleFingerDragMode = false;
+ private Point centerPoint = new Point(0, 0);
+ private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
private void BorderMultiTouchMode_MouseUp(object sender, MouseButtonEventArgs e) {
if (isInMultiTouchMode) {
@@ -81,6 +86,7 @@ namespace Ink_Canvas {
}
private void MainWindow_StylusDown(object sender, StylusDownEventArgs e) {
+ SetCursorBasedOnEditingMode(inkCanvas);
inkCanvas.CaptureStylus();
ViewboxFloatingBar.IsHitTestVisible = false;
@@ -200,7 +206,6 @@ namespace Ink_Canvas {
private Point iniP = new Point(0, 0);
private bool isLastTouchEraser = false;
- private bool forcePointEraser = true;
// 用于记录手掌擦的尺寸和形状
private StylusShape currentPalmEraserShape = null;
@@ -233,111 +238,35 @@ namespace Ink_Canvas {
}
private void Main_Grid_TouchDown(object sender, TouchEventArgs e) {
- // 确保触摸时显示自定义光标
- if (Settings.Canvas.IsShowCursor) {
- inkCanvas.ForceCursor = true;
- System.Windows.Forms.Cursor.Show();
- }
-
+ SetCursorBasedOnEditingMode(inkCanvas);
inkCanvas.CaptureTouch(e.TouchDevice);
- ViewboxFloatingBar.IsHitTestVisible = false;
- BlackboardUIGridForInkReplay.IsHitTestVisible = false;
- if (!isHidingSubPanelsWhenInking) {
- isHidingSubPanelsWhenInking = true;
- HideSubPanels(); // 书写时自动隐藏二级菜单
- }
-
- if (NeedUpdateIniP()) iniP = e.GetTouchPoint(inkCanvas).Position;
- if (drawingShapeMode == 9 && isFirstTouchCuboid == false) MouseTouchMove(iniP);
- inkCanvas.Opacity = 1;
-
- // 如果已处于多指书写模式，禁用手掌擦功能
- if (isInMultiTouchMode) {
- isLastTouchEraser = false;
- currentPalmEraserShape = null;
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+ // 橡皮状态下只return，保证橡皮状态可保持
return;
}
-
- // 如果已经处于手掌擦状态，保持状态不变
- if (isLastTouchEraser && currentPalmEraserShape != null) {
- inkCanvas.EraserShape = currentPalmEraserShape;
- inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) {
+ // 套索选状态下只return，保证套索选可用
return;
}
-
- double boundsWidth = GetTouchBoundWidth(e), eraserMultiplier = 1.0;
- if (!Settings.Advanced.EraserBindTouchMultiplier && Settings.Advanced.IsSpecialScreen)
- eraserMultiplier = 1 / Settings.Advanced.TouchMultiplier;
-
- // 检查触控点数量，只有大于等于三个触控点时才激活手掌擦功能
- if (dec.Count >= 3 && boundsWidth > BoundsWidth) {
- // 保存当前的编辑模式，以便恢复
- if (!isLastTouchEraser) {
- prePalmEraserEditingMode = inkCanvas.EditingMode;
- // 模拟点击橡皮选项卡
- EraserIcon_Click(null, null);
- }
-
- isLastTouchEraser = true;
- if (drawingShapeMode == 0 && forceEraser) return;
- if (boundsWidth > BoundsWidth * 2.5) {
- // 直接使用固定尺寸的矩形黑板擦形状，不随触控面积动态变化
- currentPalmEraserShape = GetPalmRectangleEraserShape(eraserMultiplier);
- inkCanvas.EraserShape = currentPalmEraserShape;
- TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
- }
- else {
- if (StackPanelPPTControls.Visibility == Visibility.Visible && inkCanvas.Strokes.Count == 0 &&
- Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl) {
- isLastTouchEraser = false;
- currentPalmEraserShape = null;
- inkCanvas.EditingMode = InkCanvasEditingMode.GestureOnly;
- inkCanvas.Opacity = 0.1;
- }
- else {
- // 手掌橡皮固定为矩形黑板擦，大小由设置决定
- currentPalmEraserShape = GetPalmRectangleEraserShape(eraserMultiplier);
- inkCanvas.EraserShape = currentPalmEraserShape;
- TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
- }
+ if (drawingShapeMode == 9) {
+ if (isFirstTouchCuboid) {
+ CuboidFrontRectIniP = e.GetTouchPoint(inkCanvas).Position;
}
+ // 允许MouseTouchMove在TouchMove时处理
+ return;
}
- else {
- isLastTouchEraser = false;
- currentPalmEraserShape = null;
- // 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
- inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
- // 修复触屏状态下几何绘制功能不可用的问题：在几何绘制模式下不应该因为forceEraser而直接返回
- if (forceEraser && drawingShapeMode == 0) return;
- inkCanvas.EraserShape =
- forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
- if (forceEraser) return;
- inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ if (drawingShapeMode != 0) {
+ return;
}
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
+ return;
+ }
+ inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
}
- private double GetTouchBoundWidth(TouchEventArgs e) {
- var args = e.GetTouchPoint(null).Bounds;
- double value;
- if (!Settings.Advanced.IsQuadIR) value = args.Width;
- else value = Math.Sqrt(args.Width * args.Height); //四边红外
- if (Settings.Advanced.IsSpecialScreen) value *= Settings.Advanced.TouchMultiplier;
- return value;
- }
-
- //记录触摸设备ID
- private List dec = new List();
-
- //中心点
- private Point centerPoint;
- private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
- private bool isSingleFingerDragMode = false;
-
- // 保存触发手掌擦前的编辑模式，用于手掌擦结束后恢复
- private InkCanvasEditingMode prePalmEraserEditingMode = InkCanvasEditingMode.Ink;
-
private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e) {
+ SetCursorBasedOnEditingMode(inkCanvas);
inkCanvas.CaptureTouch(e.TouchDevice);
ViewboxFloatingBar.IsHitTestVisible = false;
From 02e143217e4af5a57af5ff8fe29d23e8c9750a1a Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 16:21:39 +0800
Subject: [PATCH 09/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index e36f7675..db468872 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
@@ -103,10 +103,18 @@ namespace Ink_Canvas {
}
private void BtnPen_Click(object sender, RoutedEventArgs e) {
+ // 如果当前已是批注模式，再次点击弹出批注子面板
+ if (penType == 0 && inkCanvas.EditingMode == InkCanvasEditingMode.Ink && !drawingAttributes.IsHighlighter) {
+ return;
+ }
+ // 否则只切换到批注模式，不弹出子面板
forceEraser = false;
forcePointEraser = false;
isLastTouchEraser = false;
drawingShapeMode = 0;
+ penType = 0;
+ drawingAttributes.IsHighlighter = false;
+ drawingAttributes.StylusTip = StylusTip.Ellipse;
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
SetCursorBasedOnEditingMode(inkCanvas);
}
From 854be23cfb06e245ef0c1ef5c6ab54141ef41804 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 16:28:50 +0800
Subject: [PATCH 10/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 40 +++++++++++++++++-----
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index b76cac43..817ecdbe 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -28,7 +28,9 @@ namespace Ink_Canvas {
inkCanvas.StylusUp -= MainWindow_StylusUp;
inkCanvas.TouchDown -= MainWindow_TouchDown;
inkCanvas.TouchDown += Main_Grid_TouchDown;
- inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ }
inkCanvas.Children.Clear();
isInMultiTouchMode = false;
@@ -48,7 +50,9 @@ namespace Ink_Canvas {
inkCanvas.StylusUp += MainWindow_StylusUp;
inkCanvas.TouchDown += MainWindow_TouchDown;
inkCanvas.TouchDown -= Main_Grid_TouchDown;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ }
inkCanvas.Children.Clear();
isInMultiTouchMode = true;
}
@@ -75,13 +79,17 @@ namespace Ink_Canvas {
inkCanvas.EraserShape = currentPalmEraserShape;
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
isLastTouchEraser = true;
- inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
+ }
}
else {
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.None;
// 修复面积擦时不显示橡皮形状：无论 forcePointEraser 状态，均显示 50x50 橡皮
inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ }
}
}
@@ -262,10 +270,16 @@ namespace Ink_Canvas {
if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) {
return;
}
- inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ }
}
private void inkCanvas_PreviewTouchDown(object sender, TouchEventArgs e) {
+ // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+ return;
+ }
SetCursorBasedOnEditingMode(inkCanvas);
inkCanvas.CaptureTouch(e.TouchDevice);
@@ -287,11 +301,17 @@ namespace Ink_Canvas {
if (inkCanvas.EditingMode == InkCanvasEditingMode.None ||
inkCanvas.EditingMode == InkCanvasEditingMode.Select) return;
lastInkCanvasEditingMode = inkCanvas.EditingMode;
- inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ }
}
}
private void inkCanvas_PreviewTouchUp(object sender, TouchEventArgs e) {
+ // 橡皮状态下不做任何切换，直接return，保证橡皮可持续
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
+ return;
+ }
inkCanvas.ReleaseAllTouchCaptures();
ViewboxFloatingBar.IsHitTestVisible = true;
BlackboardUIGridForInkReplay.IsHitTestVisible = true;
@@ -299,7 +319,9 @@ namespace Ink_Canvas {
//手势完成后切回之前的状态
if (dec.Count > 1)
if (inkCanvas.EditingMode == InkCanvasEditingMode.None)
- inkCanvas.EditingMode = lastInkCanvasEditingMode;
+ if (lastInkCanvasEditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = lastInkCanvasEditingMode;
+ }
dec.Remove(e.TouchDevice.Id);
inkCanvas.Opacity = 1;
@@ -347,7 +369,9 @@ namespace Ink_Canvas {
private void Main_Grid_ManipulationCompleted(object sender, ManipulationCompletedEventArgs e) {
if (e.Manipulators.Count() != 0) return;
if (forceEraser) return;
- inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint) {
+ inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ }
}
private void Main_Grid_ManipulationDelta(object sender, ManipulationDeltaEventArgs e) {
From 69ae0ffc71c050c05a0efc69a85e2b8043a3461f Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 17:01:18 +0800
Subject: [PATCH 11/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index 817ecdbe..d25e621f 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -316,6 +316,16 @@ namespace Ink_Canvas {
ViewboxFloatingBar.IsHitTestVisible = true;
BlackboardUIGridForInkReplay.IsHitTestVisible = true;
+ // 新增：几何绘制模式下，触摸抬手时自动落笔
+ if (drawingShapeMode != 0) {
+ var mouseArgs = new MouseButtonEventArgs(Mouse.PrimaryDevice, 0, MouseButton.Left)
+ {
+ RoutedEvent = UIElement.MouseLeftButtonUpEvent,
+ Source = inkCanvas
+ };
+ inkCanvas_MouseUp(inkCanvas, mouseArgs);
+ }
+
//手势完成后切回之前的状态
if (dec.Count > 1)
if (inkCanvas.EditingMode == InkCanvasEditingMode.None)
From 64128929852af29060c14c377347fa0a5f1dc94c Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 17:02:17 +0800
Subject: [PATCH 12/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index d25e621f..e15f3725 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -292,6 +292,11 @@ namespace Ink_Canvas {
var touchPoint = e.GetTouchPoint(inkCanvas);
centerPoint = touchPoint.Position;
+ // 新增：几何绘制模式下，记录初始点
+ if (drawingShapeMode != 0) {
+ iniP = touchPoint.Position;
+ }
+
//记录第一根手指点击时的 StrokeCollection
lastTouchDownStrokeCollection = inkCanvas.Strokes.Clone();
}
From 2d7eff820531a38599a6493bb9ca291f67eb3a06 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 17:59:17 +0800
Subject: [PATCH 13/33] =?UTF-8?q?fix:=E8=A7=A6=E6=91=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MainWindow_cs/MW_FloatingBarIcons.cs | 3 ++
.../MainWindow_cs/MW_SelectionGestures.cs | 3 ++
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 38 +++++++++++++++++++
3 files changed, 44 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 095a99a7..5c236158 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -1440,6 +1440,7 @@ namespace Ink_Canvas {
}
private void EraserIcon_Click(object sender, RoutedEventArgs e) {
+ EnterMultiTouchModeIfNeeded();
bool isAlreadyEraser = inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint;
forceEraser = false;
forcePointEraser = true;
@@ -1464,6 +1465,7 @@ namespace Ink_Canvas {
}
private void BoardEraserIcon_Click(object sender, RoutedEventArgs e) {
+ EnterMultiTouchModeIfNeeded();
bool isAlreadyEraser = inkCanvas.EditingMode == InkCanvasEditingMode.EraseByPoint;
forceEraser = false;
forcePointEraser = true;
@@ -1487,6 +1489,7 @@ namespace Ink_Canvas {
}
private void EraserIconByStrokes_Click(object sender, RoutedEventArgs e) {
+ EnterMultiTouchModeIfNeeded();
if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
diff --git a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
index 134621c2..1f666345 100644
--- a/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs
@@ -244,6 +244,7 @@ namespace Ink_Canvas {
}
private void BtnSelect_Click(object sender, RoutedEventArgs e) {
+ ExitMultiTouchModeIfNeeded();
forceEraser = true;
drawingShapeMode = 0;
inkCanvas.IsManipulationEnabled = false;
@@ -424,6 +425,7 @@ namespace Ink_Canvas {
}
private void LassoSelect_Click(object sender, RoutedEventArgs e) {
+ ExitMultiTouchModeIfNeeded();
forceEraser = false;
forcePointEraser = false;
isLastTouchEraser = false;
@@ -433,6 +435,7 @@ namespace Ink_Canvas {
}
private void BtnLassoSelect_Click(object sender, RoutedEventArgs e) {
+ ExitMultiTouchModeIfNeeded();
forceEraser = false;
forcePointEraser = false;
isLastTouchEraser = false;
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index e15f3725..eba66daf 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -479,5 +479,43 @@ namespace Ink_Canvas {
}
}
}
+
+ // 退出多指书写模式，恢复InkCanvas的TouchDown事件绑定
+ private void ExitMultiTouchModeIfNeeded()
+ {
+ if (isInMultiTouchMode)
+ {
+ inkCanvas.StylusDown -= MainWindow_StylusDown;
+ inkCanvas.StylusMove -= MainWindow_StylusMove;
+ inkCanvas.StylusUp -= MainWindow_StylusUp;
+ inkCanvas.TouchDown -= MainWindow_TouchDown;
+ inkCanvas.TouchDown += Main_Grid_TouchDown;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint)
+ {
+ inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+ }
+ inkCanvas.Children.Clear();
+ isInMultiTouchMode = false;
+ }
+ }
+
+ // 进入多指书写模式，绑定Main_Grid_TouchDown
+ private void EnterMultiTouchModeIfNeeded()
+ {
+ if (!isInMultiTouchMode)
+ {
+ inkCanvas.StylusDown += MainWindow_StylusDown;
+ inkCanvas.StylusMove += MainWindow_StylusMove;
+ inkCanvas.StylusUp += MainWindow_StylusUp;
+ inkCanvas.TouchDown += MainWindow_TouchDown;
+ inkCanvas.TouchDown -= Main_Grid_TouchDown;
+ if (inkCanvas.EditingMode != InkCanvasEditingMode.EraseByPoint)
+ {
+ inkCanvas.EditingMode = InkCanvasEditingMode.None;
+ }
+ inkCanvas.Children.Clear();
+ isInMultiTouchMode = true;
+ }
+ }
}
}
From e8f0793feb94140e76aff35dc7a805499919c016 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 18:52:01 +0800
Subject: [PATCH 14/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/AssemblyInfo.cs | 4 ++--
Ink Canvas/Properties/AssemblyInfo.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Ink Canvas/AssemblyInfo.cs b/Ink Canvas/AssemblyInfo.cs
index 83f0988b..b54137ea 100644
--- a/Ink Canvas/AssemblyInfo.cs
+++ b/Ink Canvas/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.1.1")]
+[assembly: AssemblyFileVersion("1.7.1.1")]
diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
index f3175786..b13a892c 100644
--- a/Ink Canvas/Properties/AssemblyInfo.cs
+++ b/Ink Canvas/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.1.1")]
+[assembly: AssemblyFileVersion("1.7.1.1")]
From a92e58abf1cffb354ace9ea6e01e64a37b7f4bc3 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 19:20:06 +0800
Subject: [PATCH 15/33] =?UTF-8?q?improve:=E7=99=BD=E6=9D=BF=E7=94=BB?=
=?UTF-8?q?=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml.cs | 44 +++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 4bb247bc..31cd090d 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -24,9 +24,15 @@ using System.Windows.Media.Animation;
using System.Reflection;
using Brushes = System.Windows.Media.Brushes;
using Point = System.Windows.Point;
+using System.Collections.Generic;
namespace Ink_Canvas {
public partial class MainWindow : Window {
+ // 新增：每一页一个Canvas对象
+ private List whiteboardPages = new List();
+ private int currentPageIndex = 0;
+ private System.Windows.Controls.Canvas currentCanvas = null;
+
#region Window Initialization
public MainWindow() {
@@ -109,6 +115,13 @@ namespace Ink_Canvas {
// 注册输入事件
inkCanvas.PreviewMouseDown += inkCanvas_PreviewMouseDown;
inkCanvas.StylusDown += inkCanvas_StylusDown;
+
+ // 初始化第一页Canvas
+ var firstCanvas = new System.Windows.Controls.Canvas();
+ whiteboardPages.Add(firstCanvas);
+ InkCanvasGridForInkReplay.Children.Add(firstCanvas);
+ currentPageIndex = 0;
+ ShowPage(currentPageIndex);
}
#endregion
@@ -1123,5 +1136,36 @@ namespace Ink_Canvas {
inkCanvas.EraserShape = new RectangleStylusShape(k * 90 * 0.6, k * 90);
}
}
+
+ // 显示指定页
+ private void ShowPage(int index)
+ {
+ if (index < 0 || index >= whiteboardPages.Count) return;
+ // 只切换可见性
+ for (int i = 0; i < whiteboardPages.Count; i++)
+ {
+ whiteboardPages[i].Visibility = (i == index) ? System.Windows.Visibility.Visible : System.Windows.Visibility.Collapsed;
+ }
+ currentCanvas = whiteboardPages[index];
+ currentPageIndex = index;
+ }
+ // 新建页面
+ private void AddNewPage()
+ {
+ var newCanvas = new System.Windows.Controls.Canvas();
+ whiteboardPages.Add(newCanvas);
+ InkCanvasGridForInkReplay.Children.Add(newCanvas);
+ ShowPage(whiteboardPages.Count - 1);
+ }
+ // 删除当前页面
+ private void DeleteCurrentPage()
+ {
+ if (whiteboardPages.Count <= 1) return;
+ InkCanvasGridForInkReplay.Children.Remove(currentCanvas);
+ whiteboardPages.RemoveAt(currentPageIndex);
+ if (currentPageIndex >= whiteboardPages.Count)
+ currentPageIndex = whiteboardPages.Count - 1;
+ ShowPage(currentPageIndex);
+ }
}
}
\ No newline at end of file
From a0dc60a403c1f806cf9e29f9efa0301b8a384f22 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 21:29:55 +0800
Subject: [PATCH 16/33] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_PPT.cs | 88 +++++++++++++++++++++++++++++-
1 file changed, 87 insertions(+), 1 deletion(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index b94529ac..3f9c08ff 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs
@@ -194,7 +194,7 @@ namespace Ink_Canvas {
var pptProcesses = Process.GetProcessesByName("POWERPNT");
// 根据设置和进程状态决定模式
- isWPSMode = isWPSSupportOn && wpsRunning;
+ isWPSMode = isWPSSupportOn;
LogHelper.WriteLogToFile($"初始化模式: {(isWPSMode ? "WPS" : "PowerPoint")}", LogHelper.LogType.Info);
@@ -490,6 +490,18 @@ namespace Ink_Canvas {
catch (Exception ex) {
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
}
+ // ========== 新增：WPS进程清理调用 ==========
+ if (isWPSMode && pptApplication != null)
+ {
+ try
+ {
+ if (pptApplication.Presentations.Count == 0)
+ {
+ TryCloseExtraWpsProcesses();
+ }
+ }
+ catch { }
+ }
}
private bool isPresentationHaveBlackSpace = false;
@@ -872,6 +884,18 @@ namespace Ink_Canvas {
await Application.Current.Dispatcher.InvokeAsync(() => {
ViewboxFloatingBarMarginAnimation(100, true);
});
+ // ========== 新增：WPS进程清理调用 ==========
+ if (isWPSMode && pptApplication != null)
+ {
+ try
+ {
+ if (pptApplication.Presentations.Count == 0)
+ {
+ TryCloseExtraWpsProcesses();
+ }
+ }
+ catch { }
+ }
}
catch (Exception ex) {
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
@@ -1311,5 +1335,67 @@ namespace Ink_Canvas {
base.OnClosed(e);
}
+
+ // ========== 新增：安全关闭多余WPS进程的方法 ==========
+ ///
+ /// 检查并安全关闭多余的WPS进程（仅当所有WPS都未打开PPT时）
+ ///
+ private void TryCloseExtraWpsProcesses()
+ {
+ try
+ {
+ // 检查所有WPS进程是否都没有打开PPT
+ bool allWpsNoPpt = true;
+ foreach (var processName in GetPossibleWPSProcessNames())
+ {
+ foreach (var process in Process.GetProcessesByName(processName))
+ {
+ try
+ {
+ dynamic wpsApp = null;
+ try
+ {
+ wpsApp = Marshal.GetActiveObject(processName + ".Application");
+ }
+ catch { }
+ if (wpsApp != null)
+ {
+ if (wpsApp.Presentations.Count > 0)
+ {
+ allWpsNoPpt = false;
+ break;
+ }
+ }
+ }
+ catch { }
+ }
+ if (!allWpsNoPpt) break;
+ }
+
+ if (allWpsNoPpt)
+ {
+ // 所有WPS都没有打开PPT，可以安全关闭
+ foreach (var processName in GetPossibleWPSProcessNames())
+ {
+ foreach (var process in Process.GetProcessesByName(processName))
+ {
+ try
+ {
+ process.Kill();
+ LogHelper.WriteLogToFile($"已终止WPS进程: {process.ProcessName}({process.Id})", LogHelper.LogType.Info);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"终止WPS进程失败: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"WPS进程清理异常: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
}
}
From 796bd99377254bf16b2fd6952af3ed905b740ad8 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Fri, 18 Jul 2025 21:51:32 +0800
Subject: [PATCH 17/33] =?UTF-8?q?improve:=E6=8F=92=E4=BB=B6=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs b/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
index 1d28d50f..c48ae3f3 100644
--- a/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
+++ b/Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs
@@ -33,6 +33,16 @@ namespace Ink_Canvas.Helpers.Plugins
// 尝试从插件数据中读取更多信息
TryReadPluginMetadata();
}
+
+ public ICCPPPluginAdapter()
+ {
+ _pluginPath = string.Empty;
+ _pluginData = new byte[0];
+ PluginPath = string.Empty;
+ _pluginName = "ICCPPPlugin";
+ _pluginVersion = new Version(1, 0, 0);
+ // 可选：初始化其他字段
+ }
///
/// 尝试从插件数据中读取元数据
From ab5493f8c4ef5ac47633d0c2a29e5663d7d92e95 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sat, 19 Jul 2025 10:18:16 +0800
Subject: [PATCH 18/33] =?UTF-8?q?improve:=E5=85=89=E6=A0=87=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 4 ++--
Ink Canvas/MainWindow.xaml.cs | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 67b01802..5616713a 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -5730,7 +5730,7 @@
-
@@ -5759,7 +5759,7 @@
-
+
Date: Sat, 19 Jul 2025 10:56:30 +0800
Subject: [PATCH 19/33] =?UTF-8?q?improve:=E5=85=89=E6=A0=87=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml.cs | 39 ++++++++++-----------
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 5 +++
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 415e126b..b0beabcd 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -171,16 +171,23 @@ namespace Ink_Canvas {
private void inkCanvas_EditingModeChanged(object sender, RoutedEventArgs e) {
var inkCanvas1 = sender as InkCanvas;
if (inkCanvas1 == null) return;
-
+
// 使用辅助方法设置光标
SetCursorBasedOnEditingMode(inkCanvas1);
if (Settings.Canvas.IsShowCursor) {
- if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink || drawingShapeMode != 0)
+ if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink ||
+ inkCanvas1.EditingMode == InkCanvasEditingMode.Select ||
+ drawingShapeMode != 0)
inkCanvas1.ForceCursor = true;
else
inkCanvas1.ForceCursor = false;
} else {
- inkCanvas1.ForceCursor = false;
+ // 套索选择模式下始终强制显示光标，即使用户设置不显示光标
+ if (inkCanvas1.EditingMode == InkCanvasEditingMode.Select) {
+ inkCanvas1.ForceCursor = true;
+ } else {
+ inkCanvas1.ForceCursor = false;
+ }
}
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
@@ -579,23 +586,20 @@ namespace Ink_Canvas {
// 添加一个辅助方法，根据当前编辑模式设置光标
public void SetCursorBasedOnEditingMode(InkCanvas canvas)
{
- // 套索选模式下光标始终显示
- if (!Settings.Canvas.IsShowCursor) {
+ // 套索选择模式下光标始终显示，无论用户设置如何
+ if (canvas.EditingMode == InkCanvasEditingMode.Select) {
canvas.UseCustomCursor = true;
canvas.ForceCursor = true;
-
- if (canvas.EditingMode == InkCanvasEditingMode.Select) {
- canvas.Cursor = Cursors.Cross;
- }
-
+ canvas.Cursor = Cursors.Cross;
System.Windows.Forms.Cursor.Show();
return;
}
+ // 其他模式按照用户设置处理
if (Settings.Canvas.IsShowCursor) {
canvas.UseCustomCursor = true;
canvas.ForceCursor = true;
-
+
// 根据编辑模式设置不同的光标
if (canvas.EditingMode == InkCanvasEditingMode.EraseByPoint) {
canvas.Cursor = Cursors.Cross;
@@ -603,16 +607,11 @@ namespace Ink_Canvas {
var sri = Application.GetResourceStream(new Uri("Resources/Cursors/Pen.cur", UriKind.Relative));
if (sri != null)
canvas.Cursor = new Cursor(sri.Stream);
- } else if (canvas.EditingMode == InkCanvasEditingMode.Select) {
- canvas.Cursor = Cursors.Cross;
}
-
+
// 确保光标可见，无论是鼠标、触控还是手写笔
System.Windows.Forms.Cursor.Show();
-
- // 强制应用光标设置
- canvas.ForceCursor = true;
-
+
// 确保手写笔模式下也能显示光标
if (Tablet.TabletDevices.Count > 0) {
foreach (TabletDevice device in Tablet.TabletDevices) {
@@ -634,14 +633,14 @@ namespace Ink_Canvas {
private void inkCanvas_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
// 使用辅助方法设置光标
- SetCursorBasedOnEditingMode(inkCanvas);
+ SetCursorBasedOnEditingMode(sender as InkCanvas);
}
// 手写笔输入
private void inkCanvas_StylusDown(object sender, StylusDownEventArgs e)
{
// 使用辅助方法设置光标
- SetCursorBasedOnEditingMode(inkCanvas);
+ SetCursorBasedOnEditingMode(sender as InkCanvas);
}
// 触摸结束，恢复光标
diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
index db468872..863ba1ff 100644
--- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
+++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
@@ -371,6 +371,11 @@ namespace Ink_Canvas {
#endregion
private void inkCanvas_TouchMove(object sender, TouchEventArgs e) {
+ // 确保套索选择模式下触摸移动时光标保持可见
+ if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) {
+ SetCursorBasedOnEditingMode(inkCanvas);
+ }
+
// 如果处于手掌擦状态，继续使用相同的橡皮形状
if (isLastTouchEraser && currentPalmEraserShape != null) {
inkCanvas.EraserShape = currentPalmEraserShape;
From 98175152db810e170bba3e165b2be446ee501bbc Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sat, 19 Jul 2025 13:35:28 +0800
Subject: [PATCH 20/33] =?UTF-8?q?improve:=E5=85=89=E6=A0=87=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 16 +-
Ink Canvas/MainWindow.xaml.cs | 16 +
Ink Canvas/MainWindow_cs/MW_Eraser.cs | 634 ++++++++++++++++++
Ink Canvas/MainWindow_cs/MW_Eraser.xaml | 140 ++++
.../MainWindow_cs/MW_FloatingBarIcons.cs | 30 +-
Ink Canvas/MainWindow_cs/MW_Settings.cs | 26 +-
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 3 +
.../InkCanvasForClass_MarkupCompile.cache | 6 +-
8 files changed, 855 insertions(+), 16 deletions(-)
create mode 100644 Ink Canvas/MainWindow_cs/MW_Eraser.cs
create mode 100644 Ink Canvas/MainWindow_cs/MW_Eraser.xaml
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 5616713a..af843d29 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -33,7 +33,13 @@
Stylus.IsTouchFeedbackEnabled="False">
-
+
+
+
+
+
+
+
@@ -121,6 +127,7 @@
+
@@ -2884,6 +2891,13 @@
ManipulationStarting="inkCanvas_ManipulationStarting"
SelectionChanged="inkCanvas_SelectionChanged"
StrokeCollected="inkCanvas_StrokeCollected" ClipToBounds="False" Background="Transparent" />
+
+
+
private void RestorePPTStrokesFromZip(string tempDir, Dictionary metadata) {
try {
+ // 确保当前处于PPT放映模式
+ if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible || pptApplication == null) {
+ throw new InvalidOperationException("当前不在PPT放映模式，无法恢复PPT墨迹");
+ }
+
// 清空当前墨迹
ClearStrokes(true);
timeMachine.ClearStrokeHistory();
@@ -448,7 +459,7 @@ namespace Ink_Canvas {
}
// 恢复当前页面的墨迹
- if (pptApplication != null && pptApplication.SlideShowWindows.Count > 0) {
+ if (pptApplication.SlideShowWindows.Count > 0) {
int currentSlide = pptApplication.SlideShowWindows[1].View.CurrentShowPosition;
if (memoryStreams[currentSlide] != null && memoryStreams[currentSlide].Length > 0) {
memoryStreams[currentSlide].Position = 0;
@@ -470,6 +481,11 @@ namespace Ink_Canvas {
///
private void RestoreWhiteboardStrokesFromZip(string tempDir, Dictionary metadata) {
try {
+ // 确保当前处于白板模式
+ if (currentMode == 0) {
+ throw new InvalidOperationException("当前不在白板模式，无法恢复白板墨迹");
+ }
+
// 清空当前墨迹
ClearStrokes(true);
timeMachine.ClearStrokeHistory();
@@ -525,27 +541,27 @@ namespace Ink_Canvas {
/// 打开单个墨迹文件
///
private void OpenSingleStrokeFile(string filePath) {
- var fileStreamHasNoStroke = false;
+ var fileStreamHasNoStroke = false;
using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read)) {
- var strokes = new StrokeCollection(fs);
- fileStreamHasNoStroke = strokes.Count == 0;
- if (!fileStreamHasNoStroke) {
- ClearStrokes(true);
- timeMachine.ClearStrokeHistory();
- inkCanvas.Strokes.Add(strokes);
- LogHelper.NewLog($"Strokes Insert: Strokes Count: {inkCanvas.Strokes.Count.ToString()}");
+ var strokes = new StrokeCollection(fs);
+ fileStreamHasNoStroke = strokes.Count == 0;
+ if (!fileStreamHasNoStroke) {
+ ClearStrokes(true);
+ timeMachine.ClearStrokeHistory();
+ inkCanvas.Strokes.Add(strokes);
+ LogHelper.NewLog($"Strokes Insert: Strokes Count: {inkCanvas.Strokes.Count.ToString()}");
+ }
}
- }
- if (fileStreamHasNoStroke)
+ if (fileStreamHasNoStroke)
using (var ms = new MemoryStream(File.ReadAllBytes(filePath))) {
- ms.Seek(0, SeekOrigin.Begin);
- var strokes = new StrokeCollection(ms);
- ClearStrokes(true);
- timeMachine.ClearStrokeHistory();
- inkCanvas.Strokes.Add(strokes);
- LogHelper.NewLog($"Strokes Insert (2): Strokes Count: {strokes.Count.ToString()}");
- }
+ ms.Seek(0, SeekOrigin.Begin);
+ var strokes = new StrokeCollection(ms);
+ ClearStrokes(true);
+ timeMachine.ClearStrokeHistory();
+ inkCanvas.Strokes.Add(strokes);
+ LogHelper.NewLog($"Strokes Insert (2): Strokes Count: {strokes.Count.ToString()}");
+ }
}
}
}
From fd8d13447c0b165d057dec0984df5271f012392c Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sat, 19 Jul 2025 17:31:08 +0800
Subject: [PATCH 33/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/AssemblyInfo.cs | 4 ++--
Ink Canvas/MainWindow.xaml | 2 +-
Ink Canvas/Properties/AssemblyInfo.cs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Ink Canvas/AssemblyInfo.cs b/Ink Canvas/AssemblyInfo.cs
index 3f0ced2e..0f179263 100644
--- a/Ink Canvas/AssemblyInfo.cs
+++ b/Ink Canvas/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.2")]
-[assembly: AssemblyFileVersion("1.7.1.2")]
+[assembly: AssemblyVersion("1.7.1.3")]
+[assembly: AssemblyFileVersion("1.7.1.3")]
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 23e01666..1b5bb979 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -2323,7 +2323,7 @@
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchSaveFullPageStrokes_Toggled" />
-
+
diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
index 214974d7..cd7e451f 100644
--- a/Ink Canvas/Properties/AssemblyInfo.cs
+++ b/Ink Canvas/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.2")]
-[assembly: AssemblyFileVersion("1.7.1.2")]
+[assembly: AssemblyVersion("1.7.1.3")]
+[assembly: AssemblyFileVersion("1.7.1.3")]