From b983cbe094f1cadb6fcbe2fa3a6b25512fe07d56 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 14 Feb 2026 00:23:05 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=AE=9A=E6=97=B6=E6=81=A2=E5=A4=8D?=
=?UTF-8?q?=E5=A2=A8=E8=BF=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 51 ++-
Ink Canvas/MainWindow.xaml.cs | 309 +++++++++++++++++-
.../MainWindow_cs/MW_FloatingBarIcons.cs | 8 +
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 90 +++++
Ink Canvas/Resources/Settings.cs | 14 +-
5 files changed, 469 insertions(+), 3 deletions(-)
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index b1de12cf..85d08d0a 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -861,7 +861,56 @@
Toggled="ToggleSwitchHideInkFadeControlInPenMenu_Toggled" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index cf9d9dd2..be15924e 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -410,6 +410,8 @@ namespace Ink_Canvas
private DrawingAttributes drawingAttributes;
private InkSmoothingManager _inkSmoothingManager;
+ private DispatcherTimer _brushAutoRestoreTimer;
+
private void loadPenCanvas()
{
try
@@ -437,6 +439,213 @@ namespace Ink_Canvas
catch { }
}
+
+ /// 目标颜色（包含Alpha通道）
+ /// 目标粗细
+ /// 目标高度（通常与width相同）
+ private void SetBrushAttributesDirectly(Color color, double width, double height)
+ {
+ try
+ {
+ if (drawingAttributes == null)
+ {
+ drawingAttributes = inkCanvas.DefaultDrawingAttributes;
+ }
+
+ drawingAttributes.Color = color;
+ drawingAttributes.Width = width;
+ drawingAttributes.Height = height;
+
+ inkCanvas.DefaultDrawingAttributes.Color = color;
+ inkCanvas.DefaultDrawingAttributes.Width = width;
+ inkCanvas.DefaultDrawingAttributes.Height = height;
+
+ drawingAttributes = inkCanvas.DefaultDrawingAttributes;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"SetBrushAttributesDirectly 出错: {ex}", LogHelper.LogType.Warning);
+ }
+ }
+
+ private void InitBrushAutoRestoreTimer()
+ {
+ if (_brushAutoRestoreTimer == null)
+ {
+ _brushAutoRestoreTimer = new DispatcherTimer();
+ _brushAutoRestoreTimer.Tick += BrushAutoRestoreTimer_Tick;
+ }
+
+ UpdateBrushAutoRestoreTimerInterval();
+ }
+
+ private void UpdateBrushAutoRestoreTimerInterval()
+ {
+ if (_brushAutoRestoreTimer == null) return;
+
+ TimeSpan? nextInterval = null;
+ try
+ {
+ var timesConfig = Settings?.Canvas?.BrushAutoRestoreTimes;
+ if (!string.IsNullOrWhiteSpace(timesConfig))
+ {
+ var parts = timesConfig
+ .Split(new[] { ';', '；', ',', '，' }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(p => p.Trim())
+ .ToList();
+
+ var validTimes = new List();
+ foreach (var part in parts)
+ {
+ if (TimeSpan.TryParse(part, out var ts) &&
+ ts >= TimeSpan.Zero &&
+ ts < TimeSpan.FromDays(1))
+ {
+ validTimes.Add(ts);
+ }
+ }
+
+ if (validTimes.Count > 0)
+ {
+ var now = DateTime.Now;
+ var today = now.Date;
+ var nowTod = now.TimeOfDay;
+
+ TimeSpan? todayNext = null;
+ foreach (var t in validTimes)
+ {
+ if (t >= nowTod)
+ {
+ if (todayNext == null || t < todayNext.Value)
+ {
+ todayNext = t;
+ }
+ }
+ }
+
+ DateTime target;
+ if (todayNext.HasValue)
+ {
+ target = today + todayNext.Value;
+ }
+ else
+ {
+ var firstTime = validTimes.OrderBy(t => t).First();
+ target = today.AddDays(1) + firstTime;
+ }
+
+ var interval = target - now;
+ if (interval < TimeSpan.FromSeconds(1))
+ {
+ interval = TimeSpan.FromSeconds(1);
+ }
+ nextInterval = interval;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"根据时间点计算画笔自动恢复时间间隔时出错: {ex}", LogHelper.LogType.Warning);
+ }
+
+ if (!nextInterval.HasValue)
+ {
+ int seconds = Settings?.Canvas?.BrushAutoRestoreDelaySeconds ?? 0;
+ if (seconds < 1) seconds = 1;
+ nextInterval = TimeSpan.FromSeconds(seconds);
+ }
+
+ _brushAutoRestoreTimer.Interval = nextInterval.Value;
+ }
+
+ internal void ScheduleBrushAutoRestore()
+ {
+ try
+ {
+ if (Settings == null || Settings.Canvas == null || !Settings.Canvas.EnableBrushAutoRestore)
+ {
+ return;
+ }
+
+ if (_brushAutoRestoreTimer == null)
+ {
+ InitBrushAutoRestoreTimer();
+ }
+ else
+ {
+ UpdateBrushAutoRestoreTimerInterval();
+ }
+
+ _brushAutoRestoreTimer.Stop();
+ _brushAutoRestoreTimer.Start();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"ScheduleBrushAutoRestore 出错: {ex}", LogHelper.LogType.Warning);
+ }
+ }
+
+ private void BrushAutoRestoreTimer_Tick(object sender, EventArgs e)
+ {
+ try
+ {
+ _brushAutoRestoreTimer.Stop();
+
+ if (Settings == null || Settings.Canvas == null || !Settings.Canvas.EnableBrushAutoRestore)
+ {
+ return;
+ }
+
+ if (drawingAttributes == null)
+ {
+ drawingAttributes = inkCanvas.DefaultDrawingAttributes;
+ }
+
+ Color targetColor = Ink_DefaultColor;
+ try
+ {
+ var colorConfig = Settings.Canvas.BrushAutoRestoreColor;
+ if (!string.IsNullOrWhiteSpace(colorConfig))
+ {
+ var converted = ColorConverter.ConvertFromString(colorConfig);
+ if (converted is Color c)
+ {
+ targetColor = c;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"解析 BrushAutoRestoreColor 失败: {ex}", LogHelper.LogType.Warning);
+ }
+
+ int alphaConfig = Settings.Canvas.BrushAutoRestoreAlpha;
+ if (alphaConfig < 0) alphaConfig = 0;
+ if (alphaConfig > 255) alphaConfig = 255;
+ targetColor.A = (byte)alphaConfig;
+
+ double width = Settings.Canvas.BrushAutoRestoreWidth;
+ if (width <= 0)
+ {
+ width = Settings.Canvas.InkWidth > 0 ? Settings.Canvas.InkWidth : 2.5;
+ }
+
+ SetBrushAttributesDirectly(targetColor, width, width);
+
+ var actualColor = inkCanvas.DefaultDrawingAttributes.Color;
+ var actualWidth = inkCanvas.DefaultDrawingAttributes.Width;
+ var actualHeight = inkCanvas.DefaultDrawingAttributes.Height;
+ LogHelper.WriteLogToFile($"画笔自动恢复已应用: 目标颜色={targetColor}, 目标粗细={width}, 目标透明度={alphaConfig}", LogHelper.LogType.Event);
+ LogHelper.WriteLogToFile($"画笔自动恢复验证: 实际颜色={actualColor}, 实际粗细={actualWidth}, 实际高度={actualHeight}", LogHelper.LogType.Event);
+ UpdateBrushAutoRestoreTimerInterval();
+ _brushAutoRestoreTimer.Start();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"BrushAutoRestoreTimer_Tick 出错: {ex}", LogHelper.LogType.Warning);
+ }
+ }
+
//ApplicationGesture lastApplicationGesture = ApplicationGesture.AllGestures;
private DateTime lastGestureTime = DateTime.Now;
@@ -826,6 +1035,7 @@ namespace Ink_Canvas
};
}
}), DispatcherPriority.Loaded);
+ AddTouchSupportToSliders();
}
private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e)
@@ -2719,6 +2929,101 @@ namespace Ink_Canvas
}
}
+ private void ToggleSwitchBrushAutoRestore_Toggled(object sender, RoutedEventArgs e)
+ {
+ try
+ {
+ if (!isLoaded) return;
+ Settings.Canvas.EnableBrushAutoRestore = ToggleSwitchBrushAutoRestore.IsOn;
+ SaveSettingsToFile();
+
+ if (Settings.Canvas.EnableBrushAutoRestore)
+ {
+ InitBrushAutoRestoreTimer();
+ ScheduleBrushAutoRestore();
+ }
+ else
+ {
+ if (_brushAutoRestoreTimer != null)
+ {
+ _brushAutoRestoreTimer.Stop();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"切换画笔自动恢复功能时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ private void BrushAutoRestoreTimesTextBox_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ try
+ {
+ if (!isLoaded) return;
+ if (Settings?.Canvas == null) return;
+
+ Settings.Canvas.BrushAutoRestoreTimes = BrushAutoRestoreTimesTextBox.Text ?? string.Empty;
+ SaveSettingsToFile();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"更新画笔自动恢复时间点时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ private void ComboBoxBrushAutoRestoreColor_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ try
+ {
+ if (!isLoaded) return;
+ if (Settings?.Canvas == null) return;
+
+ if (ComboBoxBrushAutoRestoreColor.SelectedItem is ComboBoxItem item)
+ {
+ string hex = item.Tag as string ?? string.Empty;
+ Settings.Canvas.BrushAutoRestoreColor = hex;
+ SaveSettingsToFile();
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"更新画笔自动恢复目标颜色时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ private void BrushAutoRestoreWidthSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e)
+ {
+ try
+ {
+ if (!isLoaded) return;
+ if (Settings?.Canvas == null) return;
+
+ Settings.Canvas.BrushAutoRestoreWidth = e.NewValue;
+ SaveSettingsToFile();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"更新画笔自动恢复目标粗细时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
+ private void BrushAutoRestoreAlphaSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e)
+ {
+ try
+ {
+ if (!isLoaded) return;
+ if (Settings?.Canvas == null) return;
+
+ Settings.Canvas.BrushAutoRestoreAlpha = (int)e.NewValue;
+ SaveSettingsToFile();
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"更新画笔自动恢复目标透明度时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
+ }
+
///
/// 更新墨迹渐隐控制开关的可见性
///
@@ -3087,7 +3392,9 @@ namespace Ink_Canvas
InkAlphaSlider,
HighlighterWidthSlider,
MLAvoidanceHistorySlider,
- MLAvoidanceWeightSlider
+ MLAvoidanceWeightSlider,
+ BrushAutoRestoreWidthSlider,
+ BrushAutoRestoreAlphaSlider
};
foreach (var slider in sliders)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 5a8e0b01..8cfe4bc3 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -2423,41 +2423,49 @@ namespace Ink_Canvas
private void QuickColorWhite_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Colors.White);
+ ScheduleBrushAutoRestore();
}
private void QuickColorOrange_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Color.FromRgb(251, 150, 80)); // 橙色
+ ScheduleBrushAutoRestore();
}
private void QuickColorYellow_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Colors.Yellow);
+ ScheduleBrushAutoRestore();
}
private void QuickColorBlack_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Colors.Black);
+ ScheduleBrushAutoRestore();
}
private void QuickColorBlue_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Color.FromRgb(37, 99, 235)); // 蓝色
+ ScheduleBrushAutoRestore();
}
private void QuickColorRed_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Colors.Red);
+ ScheduleBrushAutoRestore();
}
private void QuickColorGreen_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Color.FromRgb(22, 163, 74));
+ ScheduleBrushAutoRestore();
}
private void QuickColorPurple_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Color.FromRgb(147, 51, 234));
+ ScheduleBrushAutoRestore();
}
private void SetQuickColor(Color color)
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 34ccad86..15084270 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -1205,6 +1205,96 @@ namespace Ink_Canvas
// 加载墨迹渐隐设置
LoadInkFadeSettings();
+
+ // 加载画笔自动恢复设置
+ LoadBrushAutoRestoreSettings();
+ }
+
+ private void LoadBrushAutoRestoreSettings()
+ {
+ try
+ {
+ // 同步设置面板中的开关状态
+ if (ToggleSwitchBrushAutoRestore != null)
+ {
+ ToggleSwitchBrushAutoRestore.IsOn = Settings.Canvas.EnableBrushAutoRestore;
+ }
+
+ // 同步时间点输入框
+ if (BrushAutoRestoreTimesTextBox != null)
+ {
+ BrushAutoRestoreTimesTextBox.Text = Settings.Canvas.BrushAutoRestoreTimes ?? string.Empty;
+ }
+
+ // 同步颜色下拉框
+ if (ComboBoxBrushAutoRestoreColor != null)
+ {
+ if (string.IsNullOrWhiteSpace(Settings.Canvas.BrushAutoRestoreColor))
+ {
+ Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+ }
+
+ bool found = false;
+ foreach (ComboBoxItem item in ComboBoxBrushAutoRestoreColor.Items)
+ {
+ if (item.Tag != null && item.Tag.ToString() == Settings.Canvas.BrushAutoRestoreColor)
+ {
+ ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+ try
+ {
+ ComboBoxBrushAutoRestoreColor.SelectedItem = item;
+ }
+ finally
+ {
+ ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+ }
+ found = true;
+ break;
+ }
+ }
+
+ if (!found && ComboBoxBrushAutoRestoreColor.Items.Count > 0)
+ {
+ ComboBoxBrushAutoRestoreColor.SelectionChanged -= ComboBoxBrushAutoRestoreColor_SelectionChanged;
+ try
+ {
+ ComboBoxBrushAutoRestoreColor.SelectedIndex = 0;
+ Settings.Canvas.BrushAutoRestoreColor = "#FFFF0000";
+ }
+ finally
+ {
+ ComboBoxBrushAutoRestoreColor.SelectionChanged += ComboBoxBrushAutoRestoreColor_SelectionChanged;
+ }
+ }
+ }
+
+ // 同步粗细滑块
+ if (BrushAutoRestoreWidthSlider != null)
+ {
+ BrushAutoRestoreWidthSlider.Value = Settings.Canvas.BrushAutoRestoreWidth > 0
+ ? Settings.Canvas.BrushAutoRestoreWidth
+ : 5;
+ }
+
+ // 同步透明度滑块
+ if (BrushAutoRestoreAlphaSlider != null)
+ {
+ BrushAutoRestoreAlphaSlider.Value = Settings.Canvas.BrushAutoRestoreAlpha;
+ }
+
+ // 如果功能已启用，初始化并启动定时器
+ if (Settings.Canvas.EnableBrushAutoRestore)
+ {
+ InitBrushAutoRestoreTimer();
+ ScheduleBrushAutoRestore();
+ }
+
+ LogHelper.WriteLogToFile("画笔自动恢复设置已加载", LogHelper.LogType.Event);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"加载画笔自动恢复设置时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
}
///
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 35828212..8aa4ba0b 100644
--- a/Ink Canvas/Resources/Settings.cs
+++ b/Ink Canvas/Resources/Settings.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
@@ -108,6 +108,18 @@ namespace Ink_Canvas
public int InkFadeTime { get; set; } = 3000; // 墨迹渐隐时间（毫秒）
[JsonProperty("hideInkFadeControlInPenMenu")]
public bool HideInkFadeControlInPenMenu { get; set; } = false; // 是否在笔工具菜单中隐藏墨迹渐隐控制开关
+ [JsonProperty("enableBrushAutoRestore")]
+ public bool EnableBrushAutoRestore { get; set; } = false;
+ [JsonProperty("brushAutoRestoreDelaySeconds")]
+ public int BrushAutoRestoreDelaySeconds { get; set; } = 30;
+ [JsonProperty("brushAutoRestoreTimes")]
+ public string BrushAutoRestoreTimes { get; set; } = "";
+ [JsonProperty("brushAutoRestoreColor")]
+ public string BrushAutoRestoreColor { get; set; } = "#FFFF0000";
+ [JsonProperty("brushAutoRestoreWidth")]
+ public double BrushAutoRestoreWidth { get; set; } =5;
+ [JsonProperty("brushAutoRestoreAlpha")]
+ public int BrushAutoRestoreAlpha { get; set; } = 255;
}