From db8ffd05ea023802fca2241b80b69c96a5421faf Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 16:22:50 +0800
Subject: [PATCH 01/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Windows/SplashScreen.xaml | 3 ---
...vasForClass.csproj.AssemblyReference.cache | Bin 38181 -> 38044 bytes
2 files changed, 3 deletions(-)
diff --git a/Ink Canvas/Windows/SplashScreen.xaml b/Ink Canvas/Windows/SplashScreen.xaml
index 8ad2c252..7047736e 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml
+++ b/Ink Canvas/Windows/SplashScreen.xaml
@@ -11,9 +11,6 @@
ResizeMode="NoResize"
WindowStartupLocation="CenterScreen">
-
-
-
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 57d842b8b7d92d5308ee26301638a87ff9085d80..c8c2dfbd497b829755ee6211820ad2e2d43c9d13 100644
GIT binary patch
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
From dd09a42f0252df0a66d2dfd8bb8a7812fa25d07b Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 16:33:54 +0800
Subject: [PATCH 02/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Windows/SplashScreen.xaml | 2 +-
...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/Ink Canvas/Windows/SplashScreen.xaml b/Ink Canvas/Windows/SplashScreen.xaml
index 7047736e..c716bf1b 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml
+++ b/Ink Canvas/Windows/SplashScreen.xaml
@@ -25,7 +25,7 @@
Foreground="FloralWhite"
HorizontalAlignment="Right"
VerticalAlignment="Top"
- Margin="0,10,50,0"
+ Margin="0,80,50,0"
Opacity="0.8"
Panel.ZIndex="1000" />
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
From c347809eea2ac810e6b3566a37b30b3a908f5800 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 16:38:40 +0800
Subject: [PATCH 03/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Windows/SplashScreen.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Ink Canvas/Windows/SplashScreen.xaml b/Ink Canvas/Windows/SplashScreen.xaml
index c716bf1b..e7c94ab1 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml
+++ b/Ink Canvas/Windows/SplashScreen.xaml
@@ -25,7 +25,7 @@
Foreground="FloralWhite"
HorizontalAlignment="Right"
VerticalAlignment="Top"
- Margin="0,80,50,0"
+ Margin="0,80,60,0"
Opacity="0.8"
Panel.ZIndex="1000" />
From fa7c1fd6468591947864dd6a3297fe62ab76968c Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 17:04:12 +0800
Subject: [PATCH 04/36] =?UTF-8?q?fix:=E5=B1=8F=E8=94=BD=E5=8E=8B=E6=84=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_Settings.cs | 1 +
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 1 +
Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index dd5391e5..dee18c4d 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -1064,6 +1064,7 @@ namespace Ink_Canvas
if (!isLoaded) return;
Settings.Canvas.DisablePressure = ToggleSwitchDisablePressure.IsOn;
+ inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
// 如果启用了屏蔽压感,则自动关闭压感触屏模式
if (Settings.Canvas.DisablePressure && Settings.Canvas.EnablePressureTouchMode)
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 0653fd3a..87193221 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -652,6 +652,7 @@ namespace Ink_Canvas
// 初始化屏蔽压感开关状态
ToggleSwitchDisablePressure.IsOn = Settings.Canvas.DisablePressure;
+ inkCanvas.DefaultDrawingAttributes.IgnorePressure = Settings.Canvas.DisablePressure;
ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
index b34b60b4..6a1c758f 100644
--- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
+++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs
@@ -464,7 +464,7 @@ namespace Ink_Canvas
var strokeVisual = GetStrokeVisual(e.StylusDevice.Id);
var stylusPointCollection = e.GetStylusPoints(this);
foreach (var stylusPoint in stylusPointCollection)
- strokeVisual.Add(new StylusPoint(stylusPoint.X, stylusPoint.Y, stylusPoint.PressureFactor));
+ strokeVisual.Add(new StylusPoint(stylusPoint.X, stylusPoint.Y, stylusPoint.PressureFactor));
strokeVisual.Redraw();
}
catch { }
From 46a1e5ff144e2e1062441a4819ebf5cb32dacde3 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 17:39:56 +0800
Subject: [PATCH 05/36] =?UTF-8?q?improve:=E4=B8=BB=E9=A2=98=E5=88=87?=
=?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 1669a49e..d38d88be 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -9428,7 +9428,7 @@
-
Date: Thu, 2 Oct 2025 18:06:08 +0800
Subject: [PATCH 06/36] =?UTF-8?q?fix:=E9=80=80=E5=87=BA=E7=99=BD=E6=9D=BF?=
=?UTF-8?q?=E5=90=8E=E6=94=B6=E7=BA=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_AutoFold.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs
index 6c4187c3..b7e0c003 100644
--- a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs
+++ b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs
@@ -103,7 +103,6 @@ namespace Ink_Canvas
HideSubPanels("cursor");
SidePannelMarginAnimation(-10);
});
- isFloatingBarChangingHideMode = false;
}
private async void LeftUnFoldButtonDisplayQuickPanel_MouseUp(object sender, MouseButtonEventArgs e)
@@ -325,7 +324,6 @@ namespace Ink_Canvas
}
});
- isFloatingBarChangingHideMode = false;
}
private async void SidePannelMarginAnimation(int MarginFromEdge, bool isNoAnimation = false) // Possible value: -50, -10
From 7fbd3639b6c6fa8c8f64d46bac0fbf296121aab4 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 18:15:39 +0800
Subject: [PATCH 07/36] =?UTF-8?q?fix:=E9=80=80=E5=87=BA=E7=99=BD=E6=9D=BF?=
=?UTF-8?q?=E5=90=8E=E6=94=B6=E7=BA=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 5fe56780..455ea027 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -3003,10 +3003,18 @@ namespace Ink_Canvas
// 新增:在屏幕模式下恢复基础浮动栏的显示
ViewboxFloatingBar.Visibility = Visibility.Visible;
- // 新增:退出白板时自动收纳功能
+ // 新增:退出白板时自动收纳功能 - 等待浮动栏完全展开后再收纳
if (Settings.Automation.IsAutoFoldWhenExitWhiteboard && !isFloatingBarFolded)
{
- FoldFloatingBar_MouseUp(null, null);
+ // 使用异步延迟,等待浮动栏展开动画完成后再收纳
+ Task.Run(async () =>
+ {
+ await Task.Delay(700);
+ await Dispatcher.InvokeAsync(() =>
+ {
+ FoldFloatingBar_MouseUp(new object(), null);
+ });
+ });
}
if (BtnSwitchTheme.Content.ToString() == "浅色")
From 2b4f88becd688b7c4fc47a2d5ed0b89a2cd1dc0b Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 18:48:11 +0800
Subject: [PATCH 08/36] fix:issue #237
---
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 87193221..7234e5eb 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -10,6 +10,8 @@ using System.Windows.Ink;
using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+using WinForms = System.Windows.Forms;
using File = System.IO.File;
using OperatingSystem = OSVersionExtension.OperatingSystem;
@@ -821,6 +823,14 @@ namespace Ink_Canvas
if (Settings.Advanced.IsEnableAvoidFullScreenHelper)
{
AvoidFullScreenHelper.StartAvoidFullScreen(this);
+ Dispatcher.BeginInvoke(new Action(() =>
+ {
+ if (isLoaded)
+ {
+ MoveWindow(new WindowInteropHelper(this).Handle, 0, 0,
+ WinForms.Screen.PrimaryScreen.Bounds.Width, WinForms.Screen.PrimaryScreen.Bounds.Height, true);
+ }
+ }), DispatcherPriority.ApplicationIdle);
}
if (Settings.Advanced.IsEnableEdgeGestureUtil)
{
From f6aebb15b46f8a80b68689025dee8efec3c19e84 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 18:54:09 +0800
Subject: [PATCH 09/36] improve:aovidfullsreen
---
.../MainWindow_cs/MW_FloatingBarIcons.cs | 41 +++++++++++++-----
...vasForClass.csproj.AssemblyReference.cache | Bin 38181 -> 38044 bytes
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 455ea027..cea36e19 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -1583,30 +1583,47 @@ namespace Ink_Canvas
if (!PosXCaculatedWithTaskbarHeight)
{
- // 如果任务栏高度为0(隐藏状态),则使用固定边距
- if (toolbarHeight == 0)
+ if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
- pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
+ var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
+ pos.Y = workingAreaHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
}
else
{
- pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+ // 如果任务栏高度为0(隐藏状态),则使用固定边距
+ if (toolbarHeight == 0)
+ {
+ pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+ LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
+ }
+ else
+ {
+ pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+ }
}
}
else if (PosXCaculatedWithTaskbarHeight)
{
- // 如果任务栏高度为0(隐藏状态),则使用固定高度
- if (toolbarHeight == 0)
+ if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
- pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
- 3 * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
+ var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
+ pos.Y = workingAreaHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+ ViewboxFloatingBarScaleTransform.ScaleY * 3;
}
else
{
- pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
- toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+ // 如果任务栏高度为0(隐藏状态),则使用固定高度
+ if (toolbarHeight == 0)
+ {
+ pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+ 3 * ViewboxFloatingBarScaleTransform.ScaleY;
+ LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
+ }
+ else
+ {
+ pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+ toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
+ }
}
}
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 57d842b8b7d92d5308ee26301638a87ff9085d80..c8c2dfbd497b829755ee6211820ad2e2d43c9d13 100644
GIT binary patch
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
From c135bf8fb82d3e8a861a2a2498f0e75def43a430 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 18:57:49 +0800
Subject: [PATCH 10/36] improve:aovidfullsreen
---
.../MainWindow_cs/MW_FloatingBarIcons.cs | 42 ++++++------------
...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index cea36e19..71e16658 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -1513,6 +1513,11 @@ namespace Ink_Canvas
return;
}
+ if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+ {
+ return;
+ }
+
if (MarginFromEdge == 60) MarginFromEdge = 55;
await Dispatcher.InvokeAsync(() =>
{
@@ -1583,47 +1588,26 @@ namespace Ink_Canvas
if (!PosXCaculatedWithTaskbarHeight)
{
- if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+ if (toolbarHeight == 0)
{
- var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
- pos.Y = workingAreaHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+ pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
}
else
{
- // 如果任务栏高度为0(隐藏状态),则使用固定边距
- if (toolbarHeight == 0)
- {
- pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
- }
- else
- {
- pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
- }
+ pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
}
}
else if (PosXCaculatedWithTaskbarHeight)
{
- if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+ if (toolbarHeight == 0)
{
- var workingAreaHeight = Screen.FromHandle(windowHandle).WorkingArea.Height / dpiScaleY;
- pos.Y = workingAreaHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
- ViewboxFloatingBarScaleTransform.ScaleY * 3;
+ pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+ 3 * ViewboxFloatingBarScaleTransform.ScaleY;
}
else
{
- // 如果任务栏高度为0(隐藏状态),则使用固定高度
- if (toolbarHeight == 0)
- {
- pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
- 3 * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
- }
- else
- {
- pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
- toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
- }
+ pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
+ toolbarHeight - ViewboxFloatingBarScaleTransform.ScaleY * 3;
}
}
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
From bd9095b4c2db1cd4ceddbb200e168b9f937ca281 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:04:28 +0800
Subject: [PATCH 11/36] improve:aovidfullsreen
---
.../MainWindow_cs/MW_FloatingBarIcons.cs | 9 ++++-----
...vasForClass.csproj.AssemblyReference.cache | Bin 38181 -> 38044 bytes
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 71e16658..455ea027 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -1513,11 +1513,6 @@ namespace Ink_Canvas
return;
}
- if (Settings.Advanced.IsEnableAvoidFullScreenHelper && BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
- {
- return;
- }
-
if (MarginFromEdge == 60) MarginFromEdge = 55;
await Dispatcher.InvokeAsync(() =>
{
@@ -1588,9 +1583,11 @@ namespace Ink_Canvas
if (!PosXCaculatedWithTaskbarHeight)
{
+ // 如果任务栏高度为0(隐藏状态),则使用固定边距
if (toolbarHeight == 0)
{
pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
+ LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
}
else
{
@@ -1599,10 +1596,12 @@ namespace Ink_Canvas
}
else if (PosXCaculatedWithTaskbarHeight)
{
+ // 如果任务栏高度为0(隐藏状态),则使用固定高度
if (toolbarHeight == 0)
{
pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
3 * ViewboxFloatingBarScaleTransform.ScaleY;
+ LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
}
else
{
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 57d842b8b7d92d5308ee26301638a87ff9085d80..c8c2dfbd497b829755ee6211820ad2e2d43c9d13 100644
GIT binary patch
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
From 7e94c945ff15c0189e06a421667c95e134cb042f Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:05:24 +0800
Subject: [PATCH 12/36] improve:aovidfullsreen
---
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 455ea027..f2d40ab7 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
@@ -1587,7 +1587,6 @@ namespace Ink_Canvas
if (toolbarHeight == 0)
{
pos.Y = screenHeight - MarginFromEdge * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定边距: {MarginFromEdge}");
}
else
{
@@ -1601,7 +1600,6 @@ namespace Ink_Canvas
{
pos.Y = screenHeight - ViewboxFloatingBar.ActualHeight * ViewboxFloatingBarScaleTransform.ScaleY -
3 * ViewboxFloatingBarScaleTransform.ScaleY;
- LogHelper.WriteLogToFile($"任务栏隐藏,使用固定高度: {ViewboxFloatingBar.ActualHeight}");
}
else
{
From d51cbd0682d1a0bca1e6e7997270d7ce15ba9515 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:08:33 +0800
Subject: [PATCH 13/36] improve:aovidfullsreen
---
Ink Canvas/Helpers/PPTUIManager.cs | 19 ++++++++++++++++++
...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
2 files changed, 19 insertions(+)
diff --git a/Ink Canvas/Helpers/PPTUIManager.cs b/Ink Canvas/Helpers/PPTUIManager.cs
index c8482a4e..718c1ef1 100644
--- a/Ink Canvas/Helpers/PPTUIManager.cs
+++ b/Ink Canvas/Helpers/PPTUIManager.cs
@@ -1,6 +1,7 @@
using System;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Threading;
@@ -96,12 +97,30 @@ namespace Ink_Canvas.Helpers
UpdateNavigationPanelsVisibility();
UpdateNavigationButtonStyles();
+ if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
+ {
+ _dispatcher.BeginInvoke(new Action(() =>
+ {
+ MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
+ System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
+ System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+ }), DispatcherPriority.ApplicationIdle);
+ }
}
else
{
_mainWindow.BtnPPTSlideShow.Visibility = Visibility.Visible;
_mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed;
HideAllNavigationPanels();
+ if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
+ {
+ _dispatcher.BeginInvoke(new Action(() =>
+ {
+ MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
+ System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
+ System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+ }), DispatcherPriority.ApplicationIdle);
+ }
}
}
catch (Exception ex)
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
From c80af8c984dd815e07fa0c61b503322d36bdf152 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:13:20 +0800
Subject: [PATCH 14/36] improve:aovidfullsreen
---
Ink Canvas/Helpers/PPTUIManager.cs | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/Ink Canvas/Helpers/PPTUIManager.cs b/Ink Canvas/Helpers/PPTUIManager.cs
index 718c1ef1..dc5c2b86 100644
--- a/Ink Canvas/Helpers/PPTUIManager.cs
+++ b/Ink Canvas/Helpers/PPTUIManager.cs
@@ -99,6 +99,8 @@ namespace Ink_Canvas.Helpers
UpdateNavigationButtonStyles();
if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
{
+ // 设置为画板模式,允许全屏操作
+ AvoidFullScreenHelper.SetBoardMode(true);
_dispatcher.BeginInvoke(new Action(() =>
{
MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
@@ -114,11 +116,16 @@ namespace Ink_Canvas.Helpers
HideAllNavigationPanels();
if (MainWindow.Settings.Advanced.IsEnableAvoidFullScreenHelper)
{
+ // 恢复为非画板模式,重新启用全屏限制
+ AvoidFullScreenHelper.SetBoardMode(false);
+
_dispatcher.BeginInvoke(new Action(() =>
{
- MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
- System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
- System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+ // 退出PPT放映模式,恢复到工作区域大小
+ var workingArea = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea;
+ MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle,
+ workingArea.X, workingArea.Y,
+ workingArea.Width, workingArea.Height, true);
}), DispatcherPriority.ApplicationIdle);
}
}
From 6f069b73da8bc34e5e6c3a0197bbfc9905776f32 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:20:03 +0800
Subject: [PATCH 15/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/App.xaml.cs | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs
index 396a012e..5bc6ea61 100644
--- a/Ink Canvas/App.xaml.cs
+++ b/Ink Canvas/App.xaml.cs
@@ -912,12 +912,20 @@ namespace Ink_Canvas
{
if (_isSplashScreenShown)
{
- SetSplashMessage("启动完成!");
- SetSplashProgress(100);
- // 延迟关闭启动画面,让用户看到完成消息
- Task.Delay(500).ContinueWith(_ =>
+ SetSplashMessage("正在完成初始化...");
+ SetSplashProgress(90);
+ Task.Delay(300).ContinueWith(_ =>
{
- Dispatcher.Invoke(() => CloseSplashScreen());
+ Dispatcher.Invoke(() =>
+ {
+ SetSplashMessage("启动完成!");
+ SetSplashProgress(100);
+ // 延迟关闭启动画面,让用户看到完成消息
+ Task.Delay(500).ContinueWith(__ =>
+ {
+ Dispatcher.Invoke(() => CloseSplashScreen());
+ });
+ });
});
}
};
From cea777e8b22f80a3021b2bcac79b42ab91bc2316 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:25:57 +0800
Subject: [PATCH 16/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/App.xaml.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs
index 5bc6ea61..f524565a 100644
--- a/Ink Canvas/App.xaml.cs
+++ b/Ink Canvas/App.xaml.cs
@@ -912,8 +912,8 @@ namespace Ink_Canvas
{
if (_isSplashScreenShown)
{
- SetSplashMessage("正在完成初始化...");
- SetSplashProgress(90);
+ SetSplashMessage("完成初始化...");
+ SetSplashProgress(80);
Task.Delay(300).ContinueWith(_ =>
{
Dispatcher.Invoke(() =>
From c106c4104818a7ddd3938d0aa9dbdba5deaaad25 Mon Sep 17 00:00:00 2001
From: tayasui rainnya! <156585442+Tayasui-rainnya@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:41:18 +0800
Subject: [PATCH 17/36] =?UTF-8?q?dark=E2=99=82=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Images/icc-ce_dark.png | Bin 0 -> 6040 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Images/icc-ce_dark.png
diff --git a/Images/icc-ce_dark.png b/Images/icc-ce_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..88767ac78eb6198dcacb0de61b9d01f5d8ab959a
GIT binary patch
literal 6040
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
AJOBUy
literal 0
HcmV?d00001
From 3d4c3d0acc4bdd2b9f73bfc0555a2802bd75e8ef Mon Sep 17 00:00:00 2001
From: tayasui rainnya! <156585442+Tayasui-rainnya@users.noreply.github.com>
Date: Thu, 2 Oct 2025 19:42:24 +0800
Subject: [PATCH 18/36] =?UTF-8?q?dark=E2=99=82icc-ce=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Resources/Icons-png/icc-ce_dark.png | Bin 0 -> 6040 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Ink Canvas/Resources/Icons-png/icc-ce_dark.png
diff --git a/Ink Canvas/Resources/Icons-png/icc-ce_dark.png b/Ink Canvas/Resources/Icons-png/icc-ce_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..88767ac78eb6198dcacb0de61b9d01f5d8ab959a
GIT binary patch
literal 6040
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
AJOBUy
literal 0
HcmV?d00001
From f7a5f9ae6b4bff40d3e0ad85e5b36b90d8422306 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 19:51:31 +0800
Subject: [PATCH 19/36] =?UTF-8?q?improve:=E5=90=AF=E5=8A=A8=E5=8A=A8?=
=?UTF-8?q?=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/InkCanvasForClass.csproj | 3 +++
.../Resources/Fonts/LXGWWenKaiTC-Regular.ttf | Bin 0 -> 12004 bytes
Ink Canvas/Windows/SplashScreen.xaml | 1 +
3 files changed, 4 insertions(+)
create mode 100644 Ink Canvas/Resources/Fonts/LXGWWenKaiTC-Regular.ttf
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index c2576703..76937ba1 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -564,6 +564,9 @@
+
+
+
diff --git a/Ink Canvas/Resources/Fonts/LXGWWenKaiTC-Regular.ttf b/Ink Canvas/Resources/Fonts/LXGWWenKaiTC-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..424ff1acf886d556b5eec4bacd7a47fdbc7b4436
GIT binary patch
literal 12004
zcmd6Nd3+qjoo^j|AJaYEJ>7FpYeqA=N76`|F_taa$jJDTd|LtnmW^!7wqzs8*d(0h
z2>5X(B!nD1LJ|mh+zH7B*d^RKcsba7*d*j4OR@>s5JK*NM*FKC8GCcRxBLEiqmR0)
ztE;-Ie!uVUtU?$eq@ha@Max#MAKuj5Kl>KcJdY4QI=rd9RQ>FGu0x2dhq~=MC&vyx
zxqijZ;Q0agZ{9sNa}erHgt+g*UE00>f?Yq^xA#$aegz@_TYJXG&aMCOu|o*uAA|Sh
zJy0QDLVg3!@Q>>EOwJxjM7hTiDn#LV^Zo-n$M$|<=302(56{ac$BrCCP3Tp4z6YND
zsjoh5sWIg5ADf**KH{JynxBVN!$J{3bkErSS>&8QK0S-#=feZEVQ<)vy=PYpttE6d
zss{BGsCGI!AIcKqsv6v*;yyK|#??ACr{>iLwMA`H+tp6BTkRRn4mS_C4Yv>X4lfx#
zd-&qvOGlm>c?S9@h_7lvZ&Tc>`f66KR|{&h+Nu`S4z+8zY51(+3x_Wmd2-}wX#Gya
z&kI3o1ar~Q60|EAUkd81p&t&tJoKZXpANk?^!m^nL%$jN-OwL~{xtN~FxvLWwx>ou
zIr6EICxS5*{F|UhXz1UDelhgRpuk{lw_f(Z13C(PhwrqZ{#!hzEQeBO~y2`_~Ck}VWlMEFniwz?KqT%YY`2gRcH+DLsMu5oj=q&^t%nuZcJ^wed8xLxtrU!
zHI9m-Upe#I9p=8Bht^*F^d(a_Ty)dATXxK2Kn5G_|Dpf<%k$ry|HAyE^B-uGFWYkIJqK@_`r4jH
zajLd1n8APhhlT%hS4OfEKL+u?_%TWc4El>Vtl~H$5rWY~Rs+7kzlqODyrv37C^LlZJ%2X-P!WWm&1SRXvfF958NY%fL0iF&A&$OAYTH^p*(Oqmn~wzR9DGk9U2N*Q7}Chuuv(N
z9CCAZaCBZ8v^)3MIV6A>wzz(Frb%B{=)68Eqk!6(ahm#d`43!
zKe1@l$WU&iIOG=!dX6MMbIf1+nOIEbdTy-#%jJWo?mYXVvs*e(ttcUljNUs@;q(m9
zXLSAzTqRGj(ND~oi4;%>B*nmK;(<6gjC3G#4Pt~X=nO*Z^W0-*l#7P4r|KU_ty`Z-
zCwL|5ic;IhI-`7j-WtKL>U$gWUr}_-;O*JcFjdX{rk4G9j
zTe57tEnJ3i2rAFNNFSmdfVYh>Y@q>UCK!#0123{c7|MEaz7Gco5cvpzuf)`*fg>ks
zp=kl;$y)XpKpPzNs`QW*lha{CP99lS=R~aPhcdS0DoP}-6U~e2dM;M|!MzDXi#hI_
zxFhB%p~mQ2Z)Nj_B68`7gg4w5i$n}1W=T(z%T~2ZQLiuKsB!;1%p3J!9MVLRJxeF%
z3lbH=o}>}=Rh39e3`|54`>rKwKa;RkrwTGy7g%q0{#N=`+6ErT9#}8HCxErcpw-je
z}Svn&k(hrn70V$c#SlFe8I(1EXY
z<7cTAZp%nhmZtU|h*)N8NP6r!HEOEyNVNKjW7bPAx=Ga$;~xL&v3z$@XkPh2MKFt}
zJDwfMh+JQPBCPKn&gRM8VMU4A(rJeH*;t$tu^Rh|h^4xSfYrwojQMa>2Fh0NO2kaA
zK82}_owTi}k4mR5F^$t6D)M_3!E&RQ<#TfnI2kLO#CNRkju__A_w&yMbYd0T=o*
zk@Z}D0cU`+BId
zdr?WxdeyWY(&LiQF=T6_o!hYAKAgIzU{TK~%$=vjByY4M?bNNnuYT(8xi{-vp>V}&
z*M9d31^@Arcir^~@7(M9H;O8eW;;sFP@p
z;+J{`3}fH$b$OBFsFD%Gmo_S^*AkFCeOfgWXO?2g*3(ayr={u*VjL{uu`}a}`}`^e
zFOesuvUH6A{&BMr)&e70AS$WR9JaIzPj?v-w+8n
zGC(;-SI-5XBhbf%2AkpZ1p0uU&~ZT)OZ~Xq%b*QTRm20U0&H;Z6qBJuYfCZ{E)rg-
za5q{zTDA?irN-N=y=H@MNgU{kgQ^$dghr*sU%t!RRw31^R)jg#5SE?Jn{HYlqpOp;
zx#fz^yFz|kkqp)3xo`8}izL*ha$9dm%aUJE~KEL7MVo6=J
zE4d&rO~9F&fvwn+U-zy^saL(5=}@v
zj^K!;tz8p~4%926oo9NJqRjk*^m&iY(TCk5FjFhB=gz8nu0y8Q4hdrG4j;j
zfjl#$f@p(k1E2zx`@zP7A`oey4Lral@POGN(7Hf8(XQYs&!x;zecCCEIXhFTfa^ly
z1x?2q78&Nqgg)Zr6g8}Po_a*k_4+Iot`fuXt6z|<1drXgrT;V0buCS7;-r7~xb+d@
z#y?hlb4z+cP~}!s2(>J
zzB=GXIIQFe*a0QRJ2w77IA|sD(AIAm=hBh-;{M#x?Yg-N=y2bGgQHBU7_M^
zNSyBcj%}@MIir4+ol}*t9QBk5QFEdNs$3%Jskh!})c?2XSe}`#R*i%ZIYPPXZxu)?
zMg`8Ig6T>+QSoh;Ch7+Ls3eEZ+?x$~g1Ek`Ip&M_%6Rp)N0t?GBd(mxNS8gdb(2^<
z_A!H3hX!x{cdo_{;gnrXzz<1JT)9cKZl@}!kcbc>W+-OzU~_Ww_koSIPzFI(gc*h$
zm<_U^7i;#1g5Uyy%RPB`$y|<#&9DeBDKjB~niat&LB!$)Aco4WQebhIfcN~k)UwVJ
zIu2ZgBWA<;6n025F5>*<8KrJZg_zN3J=s0137S^V9l91<@vd!ymgd@2<84k}v+l+-
zGWfaWjjKYZy#M8#L_woTuBqMFHuuSh=y<96KdllJr>hBH7>&!K6sdl6%Q;%Bnu&?r
zRim$GU0zbCk-WllcXl;xmE=gN4KT-pE%_Loq>I4+wNV$^j3D#C)O-b&=cP#qdtfcZ
zHZa0$rJ&cC8*5-Da(sxZ84sHYB@5S>x;nW@jt7ARWruk$PZBGN7NMFY?|kk5*eL
zeroP5tVNgLe}$li7qOeNjVf}A<(`6OFUfS>KyiqK6BT@ml2fUG6K+_qPEZHT|0C54
zbbKzkYe`boiR4i{n2Tlm(}Ss;+gEB&Xt7LOQ8nRu-{Gb%
zpTd1vM++6~>heWvXjm%m;#vM|C6~u{sKK
zMS$9peM<^PM#CJDm$%8p$PrHDwJYb=fg6)jB?z>&q{}Pv_eE^ig%sr@DTm5oJ#@DO
z4NMQDR{J5q45Gbe@L8UwEr7TRSkivTFRcXM1$2KvvjS6Ifk-U`2|)4wz{LXto5lb-
zcn@S{`GTOGEqaWKm4<~o56)pb1MUI_PoNYa2nakPE?+gY^sz;&R&BSvn+JWOQll-M
zs_It8a+j^&{m>3K5|aiO-*oZAKWugj-~Q|a!riYwjPH5n5&koCPXgcy1RKO8@pk+?
zpRzfe@=UGTN3t36PT`cc#mjFiEL+maE8+9Dw>FEOE#`a^$D+D7u%xoo=FDg~Y!}zP
zt4)@4ZDsYh(sq7Q+R6V|-XiT#wn{%w*9qcF`3xn3?fSCJ{~{aav6|x?@b`GoO&_J7
zreTyv2hm}43;Gby4K$2ZbJG|)%N3@WYL2jwZO0tbR6X7KT9h34&45A(!bIl2)of^h
z>j)T8=q~^p0vZE}S@_D7TR_Y{QUPUG=murW7*!MenpCq;52T))ptuO!sNj2zhS1HN
z8E!jc+5T&DO>ukh9MMjx4b^9Q!ZEFSr4bJ`v^0Rz)?{Sj?J*)6;UcYwcCHjzc|fCD
z*p&L3m)vTL&e*#CxXnYbv_f+Ir!6Pf*y#{RR_N8AQ`63KSSLD{E@4ZxQxaY=uYVuk
zMG1Dh8d4=_&W9}7
z!wkLmpFar(F=8p}+P3To8>=rI2&qv~_sdDW!)#c6TC({aH&wUQSrl?vd?cYYtAhB&
zOj4qvWkelCq}pR(&?#C0_WS`_51IIW;2W|lphW|hE+W>{B+HF~>&P=y!yE8>So8>~
zf?6!c0yvQuT0pgeju01W8Q%=z0Bbo=PJt&5%w7s^B+JAx>0mA;Fb(>=`EBe(!EMBS
zVtt4=OKVKNY|MSG%jUFtiWjHEWYmcoBABdH$g`r=2YE0*X&K)Lm1LEh(zHzU4cdM2
zvb1XJnnA*m=AR7s^sLy!*XXW$9=igE;^BI~BhaHVN+LZVcY!CUy?qMO%Ie#_2Of|5`Bt%5o{r{J!SxFfDEX}iUzjx
zr3J0SgSW^MJzf2nf<>!Q)vizx;2Y?o+l$1^#KI{zUi~S)D(^*7PV6-ddbG|;Mq+P0
z*J#M#6ua(G+29l%chkSaWZDBuW-td
zkFFcF>TOY)eR21|>9H0u-@JLLuY2cgn=T^GHBhNE=Q*91wK+?s2okPUWyjdP3_;`N%9Qr9Z|%37sC-mI)tAh7wB6H^UM
zt$x)LEiVn3E}&=6{PXk$8bO_?2c3eJq9Jq)%v2yT;PAYH|r
zs0d|*V-`LD5(R5vU=MN#UM1fLDNBxRBs6qG49qqIT!^fLErT*RR)IZYse9lO+XSd3
zbC}_R3V0c~-yTcul<^&MGA?6*(ojMfRhctKJPoRmbFpSy}+Fitq^$r>T|>vw1s
z?G9~`@{G7L+eWDSDT1Sr%*PnZzmQ}ig}Smt@IX((J_TOBtXwCV8BQelU1zz9DtVFE
z;_`MqW()7k$Z5%SMe(E8^RS83IsY8!NCm8qh*a3Yv5|)oXcFDX5O0uv3?VTe;o-j_
zU*Xw51t*GvZ2^|mI2L$Tp#E5@jXA5q)=iC%_rQ8n#r0ofnR3P9tQ0oRC0`j9tA?{fA79Q+8*a5T~{#-g-4^fnkzf
zup=HOG7U+()d86wJq5Tz0~b_)yA25Ihe
zP%4{~jtPoX=nLVLBM{zDDKA0#h)S-^r3}K8w4xHHPjx})xaw`-zj0YzgRG{_a6sC4
z%hNbZvQCd%8YhN)N97f|J|+tsPBPs@(ID8gr)UG@myV*J0*{#04l>pd)8|>nlSKz$
zbWTq06}bTZC+T5uk%0vTCRc7?$(R)^gC%2ml|ln}1|Xdk5G#vy
zf`VoVhAz7%M@+LrkO$3=dyWzC#>=p4W{^IXd0{~=cqNcqUy4CWYxcFv?I%5A4ni9k
zsRxYkiL6Z@_%B^$&lSmAg^qAiNo@+p?YXaRrz&rot+?NIH8ts8iJ#>a36kI|sj592
zwjvN*{LxDK%^49J2@enF7Y#z@&q_%SZ16SaRt}KTN5T@;4sODY1shifbWe$Je7*Wl
zn*?5QV~Q+=(J^nuWj(WIOE|1S
zUbB2-tF)RgB-9wkEj3T`1Va@qH?&a&&YMOwCXijFEU1D=ZIEw7=mnovC=`2w6H~
zDBJho9Y^JW3R_$d3BYz+;9@dw6RaDv@t{v?2EMzCX#=L?;R1=GAVh{-
z3D^N>20(5I8UmUb(2hsb27%2fW-(!N7wiClw5R6A)F^s*Wat~N~nXgX9Z2`-c57y){}Nh#Q!S|@>@
z!RA-Z6Ju_u2;0?=m^hID6>Iqx#vT^qHPD*!0BPizUsLGjMG7972MXV=Km;9F-!ogt
z2ck|09R2EKW_29jBE;i7&ZRAN?g2>4!s4+~iGy&!u`b7d
zD!eh^%npM8cag_Y7w$j@Nk3YIt7w$0MWb-<#jm0iv@4@5T7()P=h%mGP)fp1Y7VV{
zeeWWadceOLgxakLCWRZ}Z!tcIkKr!^SJsm2$&++3{W5nc-^_njm=#_Zk4W{>lk#oK
zpi)(LXo~hN{ejTy#y^>T=Kf%o8T7M-LndtXfBuW(zPHzM1H7!Y!QeyOuuvwzhYv24
zDT<+wE|fWF^TYz
z7s?W920qsM%BYzW7s@Isa-9oh4a(;%ly#itu3IRFP?^7f;K0EPrYCmqne|H@rOr0E
z^!V&dmfyH%cJ|=R;`a946SI2`?I`X%FxkHU$nL}KYvHnOd}__uM3eHLdUyDn_l)~%
z_K%PI>!%Ow9p5?YFF!Q9=fL#LU;Wsw15>ky4@~cyX=A0CcGj^e7`pcLjpMry?H`*y
zsb=xk@#&d~15Z#uAR_VC#BxDOTkCw7ic&5WPxADTLMeA=G{5^Y+w)*n7N
zK2>YHw$`B4Ke39=B9QV#U-p@?^T#IkkL}n$?jHtz_+$Ry@(upj>|+1;WM+0wPaK?`
zDb7snFCLiQ-99|H_V2uc6y^ainHRuj%>>#FTh+73M!_7H647ST@l;w04WM@QhzVJNL#C~ZUIaA;-?9Lbx2bdvIS
z#_oV|Hp3Uk;l2jGG#-@J!z>S=y-?m6%yT)6$i_VY^)vs4neBoeQ_%Bp&~qR3ZG$v!
zt!@V9dwj&ElU9B5+&97ucEi~FVI|Xlqs?MadE>#nCW0^fK+htmLq^*Zv^@E%f4hAz
ztZg-nHx*E!6Lq6jsHt(O=k2eZ{H-=PWbxPM*bY4h|6=_<98;JAsuth=nh$jN`z;w(
z{_j!nUu(^HKN0Zs_*{Lo31+=3;2NVkLq@H|ez@<1XLiVQ9GwgGj8f-9c^b+LAFS;r
zSm9c@4+Cyl+Y@VJ*gp9SjJAJ`7mR;3RQ|PbkI!ZdHrN@y88&tV$n^ndHTm$Nj*Yt<
zZGih2%xy8;|C};2uo@11BY-11j|^#D%P+L4vc|K9L5&5u>;%WE`O-|w60Ux
zb+F7I>ggO{*HY&Sc3s{PTo=K$tCQ7tmj>ZlDY2SUIx6fs0DXH-T{OTSDwjH;efiXK
z7k>yGZ>Xu9HqZ^%!SZSRp+$og_~t2{-Ruf3eRS8M{reA3oC{j@$j<#^lVh`B9wx`8
I_rY@h1CD6+LjV8(
literal 0
HcmV?d00001
diff --git a/Ink Canvas/Windows/SplashScreen.xaml b/Ink Canvas/Windows/SplashScreen.xaml
index e7c94ab1..273659f0 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml
+++ b/Ink Canvas/Windows/SplashScreen.xaml
@@ -34,6 +34,7 @@
Date: Thu, 2 Oct 2025 20:31:08 +0800
Subject: [PATCH 20/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Resources/Icons-png/icc-ce_dark.png | Bin 6040 -> 0 bytes
.../Resources/Icons-png/icc-dark.png | Bin
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 Ink Canvas/Resources/Icons-png/icc-ce_dark.png
rename Images/icc-ce_dark.png => Ink Canvas/Resources/Icons-png/icc-dark.png (100%)
diff --git a/Ink Canvas/Resources/Icons-png/icc-ce_dark.png b/Ink Canvas/Resources/Icons-png/icc-ce_dark.png
deleted file mode 100644
index 88767ac78eb6198dcacb0de61b9d01f5d8ab959a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6040
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
AJOBUy
diff --git a/Images/icc-ce_dark.png b/Ink Canvas/Resources/Icons-png/icc-dark.png
similarity index 100%
rename from Images/icc-ce_dark.png
rename to Ink Canvas/Resources/Icons-png/icc-dark.png
From 4542fcccbbca07ff2cbe5df1ccff1f1e238b05c8 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 21:52:55 +0800
Subject: [PATCH 21/36] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=BA=BF=E8=B7=AF?=
=?UTF-8?q?=E7=BB=84=E6=94=B9=E4=B8=BAinkeys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Helpers/AutoUpdateHelper.cs | 36 +++++++++---------
...vasForClass.csproj.AssemblyReference.cache | Bin 38181 -> 38044 bytes
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Ink Canvas/Helpers/AutoUpdateHelper.cs b/Ink Canvas/Helpers/AutoUpdateHelper.cs
index 8db4fb88..32fb1a5a 100644
--- a/Ink Canvas/Helpers/AutoUpdateHelper.cs
+++ b/Ink Canvas/Helpers/AutoUpdateHelper.cs
@@ -213,20 +213,20 @@ namespace Ink_Canvas.Helpers
.Select(x => x.group)
.ToList();
- // 将"智教联盟"线路组插入到最前面(如果存在)
- var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟");
- if (zhiJiaoGroup != null)
- {
- orderedGroups.Insert(0, zhiJiaoGroup);
- LogHelper.WriteLogToFile("AutoUpdate | 智教联盟线路组已插入到首位");
- }
-
- // 将"inkeys"线路组插入到第二位(如果存在)
+ // 将"inkeys"线路组插入到最前面(如果存在)
var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys");
if (inkeysGroup != null)
{
- orderedGroups.Insert(1, inkeysGroup);
- LogHelper.WriteLogToFile("AutoUpdate | inkeys线路组已插入到第二位");
+ orderedGroups.Insert(0, inkeysGroup);
+ LogHelper.WriteLogToFile("AutoUpdate | inkeys线路组已插入到首位");
+ }
+
+ // 将"智教联盟"线路组插入到第二位(如果存在)
+ var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟");
+ if (zhiJiaoGroup != null)
+ {
+ orderedGroups.Insert(1, zhiJiaoGroup);
+ LogHelper.WriteLogToFile("AutoUpdate | 智教联盟线路组已插入到第二位");
}
if (orderedGroups.Count > 0)
@@ -671,22 +671,22 @@ namespace Ink_Canvas.Helpers
SaveDownloadStatus(false);
- // 优先尝试“智教联盟”线路组
+ // 优先尝试"inkeys"线路组和"智教联盟"线路组
var zhiJiaoGroup = groups.FirstOrDefault(g => g.GroupName == "智教联盟");
var inkeysGroup = groups.FirstOrDefault(g => g.GroupName == "inkeys");
- if (zhiJiaoGroup != null || inkeysGroup != null)
+ if (inkeysGroup != null || zhiJiaoGroup != null)
{
var priorityGroups = new List();
- if (zhiJiaoGroup != null)
- {
- priorityGroups.Add(zhiJiaoGroup);
- LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试智教联盟线路组");
- }
if (inkeysGroup != null)
{
priorityGroups.Add(inkeysGroup);
LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试inkeys线路组");
}
+ if (zhiJiaoGroup != null)
+ {
+ priorityGroups.Add(zhiJiaoGroup);
+ LogHelper.WriteLogToFile("AutoUpdate | 下载时优先尝试智教联盟线路组");
+ }
groups = priorityGroups.Concat(groups.Where(g => g.GroupName != "智教联盟" && g.GroupName != "inkeys")).ToList();
}
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 57d842b8b7d92d5308ee26301638a87ff9085d80..c8c2dfbd497b829755ee6211820ad2e2d43c9d13 100644
GIT binary patch
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi
delta 70
zcmbQUl4B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb
From 18059102a3eea46463ea375e6e0a88f243e2bc7f Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 22:15:07 +0800
Subject: [PATCH 22/36] =?UTF-8?q?add:=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/InkCanvasForClass.csproj | 2 ++
Ink Canvas/MainWindow.xaml | 5 ++--
Ink Canvas/MainWindow_cs/MW_Settings.cs | 26 +++++++++++-------
.../Resources/Icons-png/icc-noshadow.png | Bin 0 -> 260001 bytes
Ink Canvas/Resources/Icons-png/icc.png | Bin 154751 -> 325978 bytes
5 files changed, 21 insertions(+), 12 deletions(-)
create mode 100644 Ink Canvas/Resources/Icons-png/icc-noshadow.png
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index 76937ba1..ba4979eb 100644
--- a/Ink Canvas/InkCanvasForClass.csproj
+++ b/Ink Canvas/InkCanvasForClass.csproj
@@ -223,6 +223,7 @@
+
@@ -528,6 +529,7 @@
+
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index d38d88be..52bba97c 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -1070,8 +1070,9 @@
-
-
+
+
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index dee18c4d..844260fd 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -356,43 +356,49 @@ namespace Ink_Canvas
else if (index == 2)
{
FloatingbarHeadIconImg.Source =
- new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png"));
- FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc-noshadow.png"));
+ FloatingbarHeadIconImg.Margin = new Thickness(0.5);
}
else if (index == 3)
{
FloatingbarHeadIconImg.Source =
- new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png"));
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
}
else if (index == 4)
{
FloatingbarHeadIconImg.Source =
- new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png"));
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
}
else if (index == 5)
{
FloatingbarHeadIconImg.Source =
- new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png"));
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
}
else if (index == 6)
{
FloatingbarHeadIconImg.Source =
- new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png"));
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
}
else if (index == 7)
+ {
+ FloatingbarHeadIconImg.Source =
+ new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png"));
+ FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
+ }
+ else if (index == 8)
{
FloatingbarHeadIconImg.Source =
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1);
}
- else if (index >= 8 && index - 8 < Settings.Appearance.CustomFloatingBarImgs.Count)
+ else if (index >= 9 && index - 9 < Settings.Appearance.CustomFloatingBarImgs.Count)
{
// 使用自定义图标
- var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 8];
+ var customIcon = Settings.Appearance.CustomFloatingBarImgs[index - 9];
try
{
FloatingbarHeadIconImg.Source = new BitmapImage(new Uri(customIcon.FilePath));
@@ -409,8 +415,8 @@ namespace Ink_Canvas
public void UpdateCustomIconsInComboBox()
{
- // 保留前8个内置图标选项
- while (ComboBoxFloatingBarImg.Items.Count > 8)
+ // 保留前9个内置图标选项
+ while (ComboBoxFloatingBarImg.Items.Count > 9)
{
ComboBoxFloatingBarImg.Items.RemoveAt(ComboBoxFloatingBarImg.Items.Count - 1);
}
diff --git a/Ink Canvas/Resources/Icons-png/icc-noshadow.png b/Ink Canvas/Resources/Icons-png/icc-noshadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca4fc6a0380e454fc77cf6a3f6bf5d45c412e2df
GIT binary patch
literal 260001
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