From d62630881ef8630a21d0e26b57a10bfea1f315e8 Mon Sep 17 00:00:00 2001 From: NullptrVoid <2963169251@qq.com> Date: Mon, 24 Aug 2026 13:01:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?improve:=E4=BC=98=E5=8C=96=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E5=99=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs index e644c8695..884d0ee41 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs @@ -63,6 +63,7 @@ private void UpdateTimer_Elapsed(object sender, ElapsedEventArgs e) if (!IsVisible) return; if (_shouldHide != null && _shouldHide()) { + _restoreCallback?.Invoke(); Close(); return; } From 767b4fb455129f793b9e0de12e52c9069a1a904f Mon Sep 17 00:00:00 2001 From: NullptrVoid <2963169251@qq.com> Date: Sun, 13 Sep 2026 11:54:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=8C=96=E8=AE=A1=E6=97=B6=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Resources/Settings.cs | 10 +++++++ .../Windows/NewStyleMinimizedTimerWindow.xaml | 27 +++++++++++++++++++ .../NewStyleMinimizedTimerWindow.xaml.cs | 26 ++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs index dbc8afbd4..55c05ade0 100644 --- a/Ink Canvas/Resources/Settings.cs +++ b/Ink Canvas/Resources/Settings.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Text.Json; namespace Ink_Canvas { @@ -55,6 +56,9 @@ public class Settings [JsonProperty("notification")] public NotificationSettings Notification { get; set; } = new NotificationSettings(); + [JsonProperty("timer")] + public TimerSettings Timer { get; set; } = new TimerSettings(); + [JsonProperty("toolbar")] public ToolbarLayoutSettings Toolbar { get; set; } = new ToolbarLayoutSettings(); @@ -299,6 +303,12 @@ public class NotificationSettings public bool IsDictationDoNotDisturbInWhiteboardEnabled { get; set; } = true; } + public class TimerSettings + { + [JsonProperty("isOpenTransparency")] + public bool IsOpenTransparency { get; set; } = true; + } + public class Security { [JsonProperty("passwordEnabled")] diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml index 0f5cee48d..2c1e001ef 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml @@ -32,6 +32,7 @@ Background="Transparent" BorderThickness="0" Click="CloseButton_Click" Cursor="Hand" Opacity="0.7"> + @@ -50,6 +51,32 @@ HorizontalAlignment="Center" VerticalAlignment="Center"/> + + + diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs index 884d0ee41..1e9575218 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs @@ -1,3 +1,5 @@ +using Ink_Canvas.Windows.SettingsViews.Helpers; +using iNKORE.UI.WPF.Modern; using System; using System.Timers; using System.Windows; @@ -30,6 +32,12 @@ public NewStyleMinimizedTimerWindow( Action stopTimerCallback) { InitializeComponent(); + if (!SettingsManager.Settings.Timer.IsOpenTransparency) + { + MainBorder.Background = new SolidColorBrush( + Color.FromArgb(255, 249, 249, 249) + ); + } _getRemainingTime = remainingTime; _shouldHide = shouldHide; _restoreCallback = restoreCallback; @@ -152,5 +160,23 @@ private void CloseButton_Click(object sender, RoutedEventArgs e) _stopTimerCallback?.Invoke(); Close(); } + + private void ToggleTransparency_Click(object sender, RoutedEventArgs e) + { + if(SettingsManager.Settings.Timer.IsOpenTransparency) + { + MainBorder.Background = new SolidColorBrush( + Color.FromArgb(255, 249, 249, 249)//完全不透明 + ); + SettingsManager.Settings.Timer.IsOpenTransparency = false; + SettingsManager.SaveSettingsToFile(); + } + else + { + MainBorder.Background = (Brush)FindResource(ThemeKeys.CardBackgroundFillColorDefaultBrushKey);//还原 + SettingsManager.Settings.Timer.IsOpenTransparency = true; + SettingsManager.SaveSettingsToFile(); + } + } } } From 301f4bc6117dcb14bd278d030bc345452e208a70 Mon Sep 17 00:00:00 2001 From: NullptrVoid <2963169251@qq.com> Date: Sat, 19 Sep 2026 10:26:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?improve:=E7=8B=AC=E7=AB=8B=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E5=8C=96=E8=AE=A1=E6=97=B6=E5=99=A8=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6=E5=BC=80=E5=85=B3=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs index 1e9575218..8e99824eb 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs @@ -34,9 +34,7 @@ public NewStyleMinimizedTimerWindow( InitializeComponent(); if (!SettingsManager.Settings.Timer.IsOpenTransparency) { - MainBorder.Background = new SolidColorBrush( - Color.FromArgb(255, 249, 249, 249) - ); + MainBorder.Background = (Brush)FindResource("NewTimerWindowBackground"); } _getRemainingTime = remainingTime; _shouldHide = shouldHide; @@ -165,9 +163,7 @@ private void ToggleTransparency_Click(object sender, RoutedEventArgs e) { if(SettingsManager.Settings.Timer.IsOpenTransparency) { - MainBorder.Background = new SolidColorBrush( - Color.FromArgb(255, 249, 249, 249)//完全不透明 - ); + MainBorder.Background = (Brush)FindResource("NewTimerWindowBackground"); SettingsManager.Settings.Timer.IsOpenTransparency = false; SettingsManager.SaveSettingsToFile(); }