From 5f06a0701cf3acc5156f8fa2a132b0b078a1c45e Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:40:54 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E7=94=BB=E7=AC=94=E9=A2=9C=E8=89=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=BA=94=E7=94=A8=E4=BA=8E=20Old=20UI=20=E6=B7=B1?= =?UTF-8?q?=E6=B5=85=E8=89=B2=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 92 +++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 21 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index cc36905d..57b10ad3 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1229,17 +1229,26 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e) BtnExit.Foreground = Brushes.White; GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FFF2F2F2")); ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark; + SetDarkColors(); //在浅色背景上使用深色墨迹 if (inkColor == 0) { inkCanvas.DefaultDrawingAttributes.Color = Colors.White; } + else if (inkColor == 1) + { + BtnColorRed_Click(null,null); + } else if (inkColor == 2) { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF1ED760"); + BtnColorGreen_Click(null,null); + } + else if (inkColor == 3) + { + BtnColorBlue_Click(null,null); } else if (inkColor == 4) { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFC000"); + BtnColorYellow_Click(null,null); } } else @@ -1252,17 +1261,26 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e) BtnExit.Foreground = Brushes.Black; GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FF1A1A1A")); ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light; + SetLightColors(); //在深色背景上使用浅色墨迹 if (inkColor == 0) { - inkCanvas.DefaultDrawingAttributes.Color = Colors.Black; + inkCanvas.DefaultDrawingAttributes.Color = Colors.White; + } + else if (inkColor == 1) + { + BtnColorRed_Click(null, null); } else if (inkColor == 2) { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF169141"); + BtnColorGreen_Click(null, null); + } + else if (inkColor == 3) + { + BtnColorBlue_Click(null, null); } else if (inkColor == 4) { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFF38B00"); + BtnColorYellow_Click(null, null); } } if (!Settings.Appearance.IsTransparentButtonBackground) @@ -1539,17 +1557,15 @@ private void BtnColorRed_Click(object sender, RoutedEventArgs e) { inkColor = 1; forceEraser = false; - inkCanvas.DefaultDrawingAttributes.Color = Colors.Red; if (BtnSwitchTheme.Content.ToString() == "浅色") { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFF3333"); - BtnColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333")); + SetDarkColors(); //在浅色背景上使用深色墨迹 } else { - inkCanvas.DefaultDrawingAttributes.Color = Colors.Red; - BtnColorRed.Background = Brushes.Red; + SetLightColors(); //在深色背景上使用浅色墨迹 } + inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorRed.Background).Color; ColorSwitchCheck(); } @@ -1560,14 +1576,13 @@ private void BtnColorGreen_Click(object sender, RoutedEventArgs e) forceEraser = false; if (BtnSwitchTheme.Content.ToString() == "浅色") { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF1ED760"); - BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760")); + SetDarkColors(); //在浅色背景上使用深色墨迹 } else { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF169141"); - BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141")); + SetLightColors(); //在深色背景上使用浅色墨迹 } + inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorGreen.Background).Color; ColorSwitchCheck(); } @@ -1576,7 +1591,7 @@ private void BtnColorBlue_Click(object sender, RoutedEventArgs e) { inkColor = 3; forceEraser = false; - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF239AD6"); + inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorBlue.Background).Color; ColorSwitchCheck(); } @@ -1587,14 +1602,13 @@ private void BtnColorYellow_Click(object sender, RoutedEventArgs e) forceEraser = false; if (BtnSwitchTheme.Content.ToString() == "浅色") { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFC000"); - BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000")); + SetDarkColors(); //在浅色背景上使用深色墨迹 } else { - inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFF38B00"); - BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00")); + SetLightColors(); //在深色背景上使用浅色墨迹 } + inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorYellow.Background).Color; ColorSwitchCheck(); } @@ -2868,8 +2882,8 @@ private void ComboBoxEraserSize_SelectionChanged(object sender, SelectionChanged Settings.Canvas.EraserSize = ComboBoxEraserSize.SelectedIndex; SaveSettingsToFile(); } - - + + private void ComboBoxEraserType_OnSelectionChanged(object sender, SelectionChangedEventArgs e) { if (!isLoaded) return; @@ -5836,6 +5850,42 @@ private void UpdateIndexInfoDisplay() } } + private void SetLightColors() + { + if (File.Exists(App.RootPath + "Colors\\Light.ini")) + { + string[] lightColors = File.ReadAllLines(App.RootPath + "Colors\\Light.ini"); + BtnColorRed.Background = new SolidColorBrush(StringToColor(lightColors[0])); + BtnColorGreen.Background = new SolidColorBrush(StringToColor(lightColors[1])); + BtnColorBlue.Background = new SolidColorBrush(StringToColor(lightColors[2])); + BtnColorYellow.Background = new SolidColorBrush(StringToColor(lightColors[3])); + } + else + { + BtnColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333")); + BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760")); + BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000")); + } + } + + private void SetDarkColors() + { + if (File.Exists(App.RootPath + "Colors\\Dark.ini")) + { + string[] darkColors = File.ReadAllLines(App.RootPath + "Colors\\Dark.ini"); + BtnColorRed.Background = new SolidColorBrush(StringToColor(darkColors[0])); + BtnColorGreen.Background = new SolidColorBrush(StringToColor(darkColors[1])); + BtnColorBlue.Background = new SolidColorBrush(StringToColor(darkColors[2])); + BtnColorYellow.Background = new SolidColorBrush(StringToColor(darkColors[3])); + } + else + { + BtnColorRed.Background = new SolidColorBrush(Colors.Red); + BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141")); + BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00")); + } + } + #endregion Whiteboard Controls #region Simulate Pen Pressure & Ink To Shape From d7d3f020d4f51e5fa01808a5989c99eec3943463 Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:42:06 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=AD=E7=9A=84=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 57b10ad3..a4780489 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1349,7 +1349,7 @@ private void BtnHideInkCanvas_Click(object sender, RoutedEventArgs e) // Auto-clear Strokes - // 很烦, 要重新来, 要等待截图完成再清理笔记 + // 很烦, 要重新来, 要等待截图完成再清理笔迹 if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible) { if (isLoaded && Settings.Automation.IsAutoClearWhenExitingWritingMode) From 51c6127f6e0a2c5b74f8b2b0985db59536718a9e Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 28 Oct 2023 22:53:04 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BA=86=E6=B5=AE=E5=8A=A8=E5=B7=A5=E5=85=B7=E6=A0=8FUI?= =?UTF-8?q?=E4=B8=AD=20=E9=BB=91=E6=9D=BF=20=E5=B1=8F=E5=B9=95=E6=89=B9?= =?UTF-8?q?=E6=B3=A8=20=E7=9A=84=E7=94=BB=E7=AC=94=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E4=BB=8D=E6=9C=89=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.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index a4780489..5e650e68 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1236,19 +1236,19 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e) } else if (inkColor == 1) { - BtnColorRed_Click(null,null); + BtnColorRed_Click(null, null); } else if (inkColor == 2) { - BtnColorGreen_Click(null,null); + BtnColorGreen_Click(null, null); } else if (inkColor == 3) { - BtnColorBlue_Click(null,null); + BtnColorBlue_Click(null, null); } else if (inkColor == 4) { - BtnColorYellow_Click(null,null); + BtnColorYellow_Click(null, null); } } else @@ -6905,6 +6905,8 @@ private void SymbolIconRedo_MouseUp(object sender, MouseButtonEventArgs e) private async void SymbolIconCursor_Click(object sender, RoutedEventArgs e) { + SetDarkColors(); + if (currentMode != 0) { ImageBlackboard_MouseUp(null, null); @@ -6986,6 +6988,9 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) if (currentMode == 0) { //进入黑板 + if (Settings.Canvas.UsingWhiteboard) SetDarkColors(); //在白板上用深色墨迹 + else SetLightColors(); //在黑板上用浅色墨迹 + Topmost = false; if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) @@ -7018,6 +7023,8 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) else { //关闭黑板 + SetDarkColors(); + Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); From 02fa77565dd0d3136476887a7de973518eb66f4b Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sun, 29 Oct 2023 08:44:37 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=A8=E5=A4=A9?= =?UTF-8?q?=E7=9A=84=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.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 5e650e68..5140e1bd 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6988,9 +6988,6 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) if (currentMode == 0) { //进入黑板 - if (Settings.Canvas.UsingWhiteboard) SetDarkColors(); //在白板上用深色墨迹 - else SetLightColors(); //在黑板上用浅色墨迹 - Topmost = false; if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) @@ -7019,12 +7016,13 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) { BorderPenColorWhite_MouseUp(BorderPenColorWhite, null); } + + if (Settings.Canvas.UsingWhiteboard) SetDarkColors(); //在白板上用深色墨迹 + else SetLightColors(); //在黑板上用浅色墨迹 } else { //关闭黑板 - SetDarkColors(); - Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); @@ -7049,6 +7047,8 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) })).Start(); } BorderPenColorRed_MouseUp(BorderPenColorRed, null); + + SetDarkColors(); } BtnSwitch_Click(BtnSwitch, null); From acc3a0c842ee46d69fdff9e686592827bfc7cf14 Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sun, 29 Oct 2023 09:19:48 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=B1=E6=B5=85?= =?UTF-8?q?=E8=89=B2=E5=88=87=E6=8D=A2=E3=80=81=E6=A0=B9=E6=8D=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了加载颜色的所有问题 - 新增对更改颜色请求是否从浮动工具栏发出的判断 --- Ink Canvas/MainWindow.xaml.cs | 72 +++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 5140e1bd..03341f98 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -46,7 +46,6 @@ public MainWindow() { InitializeComponent(); - BorderSettings.Visibility = Visibility.Collapsed; StackPanelToolButtons.Visibility = Visibility.Collapsed; BorderDrawShape.Visibility = Visibility.Collapsed; @@ -148,22 +147,21 @@ private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) } } catch { } - } + } #endregion Timer #region Ink Canvas Functions - - Color Ink_DefaultColor = Colors.Red; - + DrawingAttributes drawingAttributes; private void loadPenCanvas() { + SetDarkColors(); try { //drawingAttributes = new DrawingAttributes(); drawingAttributes = inkCanvas.DefaultDrawingAttributes; - drawingAttributes.Color = Ink_DefaultColor; + drawingAttributes.Color = ((SolidColorBrush)BtnColorRed.Background).Color; drawingAttributes.Height = 2.5; drawingAttributes.Width = 2.5; @@ -1557,13 +1555,20 @@ private void BtnColorRed_Click(object sender, RoutedEventArgs e) { inkColor = 1; forceEraser = false; - if (BtnSwitchTheme.Content.ToString() == "浅色") + if (!isLastSwitchColorByFloatBar) { - SetDarkColors(); //在浅色背景上使用深色墨迹 + if (BtnSwitchTheme.Content.ToString() == "浅色") + { + SetDarkColors(); //在浅色背景上使用深色墨迹 + } + else + { + SetLightColors(); //在深色背景上使用浅色墨迹 + } } else { - SetLightColors(); //在深色背景上使用浅色墨迹 + isLastSwitchColorByFloatBar = false; } inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorRed.Background).Color; @@ -1574,13 +1579,20 @@ private void BtnColorGreen_Click(object sender, RoutedEventArgs e) { inkColor = 2; forceEraser = false; - if (BtnSwitchTheme.Content.ToString() == "浅色") + if (!isLastSwitchColorByFloatBar) { - SetDarkColors(); //在浅色背景上使用深色墨迹 + if (BtnSwitchTheme.Content.ToString() == "浅色") + { + SetDarkColors(); //在浅色背景上使用深色墨迹 + } + else + { + SetLightColors(); //在深色背景上使用浅色墨迹 + } } else { - SetLightColors(); //在深色背景上使用浅色墨迹 + isLastSwitchColorByFloatBar = false; } inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorGreen.Background).Color; @@ -1591,6 +1603,21 @@ private void BtnColorBlue_Click(object sender, RoutedEventArgs e) { inkColor = 3; forceEraser = false; + if (!isLastSwitchColorByFloatBar) + { + if (BtnSwitchTheme.Content.ToString() == "浅色") + { + SetDarkColors(); //在浅色背景上使用深色墨迹 + } + else + { + SetLightColors(); //在深色背景上使用浅色墨迹 + } + } + else + { + isLastSwitchColorByFloatBar = false; + } inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorBlue.Background).Color; ColorSwitchCheck(); @@ -1600,13 +1627,20 @@ private void BtnColorYellow_Click(object sender, RoutedEventArgs e) { inkColor = 4; forceEraser = false; - if (BtnSwitchTheme.Content.ToString() == "浅色") + if (!isLastSwitchColorByFloatBar) { - SetDarkColors(); //在浅色背景上使用深色墨迹 + if (BtnSwitchTheme.Content.ToString() == "浅色") + { + SetDarkColors(); //在浅色背景上使用深色墨迹 + } + else + { + SetLightColors(); //在深色背景上使用浅色墨迹 + } } else { - SetLightColors(); //在深色背景上使用浅色墨迹 + isLastSwitchColorByFloatBar = false; } inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorYellow.Background).Color; @@ -5864,6 +5898,7 @@ private void SetLightColors() { BtnColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333")); BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760")); + BtnColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6")); BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000")); } } @@ -5882,6 +5917,7 @@ private void SetDarkColors() { BtnColorRed.Background = new SolidColorBrush(Colors.Red); BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141")); + BtnColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6")); BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00")); } } @@ -6853,6 +6889,8 @@ private void HideSubPanels() BorderTools.Visibility = Visibility.Collapsed; } + bool isLastSwitchColorByFloatBar = false; + private void BorderPenColorBlack_MouseUp(object sender, MouseButtonEventArgs e) { BtnColorBlack_Click(BtnColorBlack, null); @@ -6861,24 +6899,28 @@ private void BorderPenColorBlack_MouseUp(object sender, MouseButtonEventArgs e) private void BorderPenColorRed_MouseUp(object sender, MouseButtonEventArgs e) { + isLastSwitchColorByFloatBar = true; BtnColorRed_Click(BtnColorRed, null); HideSubPanels(); } private void BorderPenColorGreen_MouseUp(object sender, MouseButtonEventArgs e) { + isLastSwitchColorByFloatBar = true; BtnColorGreen_Click(BtnColorGreen, null); HideSubPanels(); } private void BorderPenColorBlue_MouseUp(object sender, MouseButtonEventArgs e) { + isLastSwitchColorByFloatBar = true; BtnColorBlue_Click(BtnColorBlue, null); HideSubPanels(); } private void BorderPenColorYellow_MouseUp(object sender, MouseButtonEventArgs e) { + isLastSwitchColorByFloatBar = true; BtnColorYellow_Click(BtnColorYellow, null); HideSubPanels(); } From 228b687c3cd721893163be9b7104bcd0f40269df Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:09:32 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=81=9A=E4=BA=86=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E7=94=BB=E7=AC=94=E9=A2=9C=E8=89=B2=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 03341f98..723e1c8e 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -147,12 +147,12 @@ private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) } } catch { } - } + } #endregion Timer #region Ink Canvas Functions - + DrawingAttributes drawingAttributes; private void loadPenCanvas() { @@ -5888,11 +5888,15 @@ private void SetLightColors() { if (File.Exists(App.RootPath + "Colors\\Light.ini")) { - string[] lightColors = File.ReadAllLines(App.RootPath + "Colors\\Light.ini"); - BtnColorRed.Background = new SolidColorBrush(StringToColor(lightColors[0])); - BtnColorGreen.Background = new SolidColorBrush(StringToColor(lightColors[1])); - BtnColorBlue.Background = new SolidColorBrush(StringToColor(lightColors[2])); - BtnColorYellow.Background = new SolidColorBrush(StringToColor(lightColors[3])); + try + { + string[] lightColors = File.ReadAllLines(App.RootPath + "Colors\\Light.ini"); + BtnColorRed.Background = new SolidColorBrush(StringToColor(lightColors[0])); + BtnColorGreen.Background = new SolidColorBrush(StringToColor(lightColors[1])); + BtnColorBlue.Background = new SolidColorBrush(StringToColor(lightColors[2])); + BtnColorYellow.Background = new SolidColorBrush(StringToColor(lightColors[3])); + } + catch (Exception) { ShowNotification("读取亮色画笔颜色配置文件时遇到问题"); } } else { @@ -5907,11 +5911,15 @@ private void SetDarkColors() { if (File.Exists(App.RootPath + "Colors\\Dark.ini")) { - string[] darkColors = File.ReadAllLines(App.RootPath + "Colors\\Dark.ini"); - BtnColorRed.Background = new SolidColorBrush(StringToColor(darkColors[0])); - BtnColorGreen.Background = new SolidColorBrush(StringToColor(darkColors[1])); - BtnColorBlue.Background = new SolidColorBrush(StringToColor(darkColors[2])); - BtnColorYellow.Background = new SolidColorBrush(StringToColor(darkColors[3])); + try + { + string[] darkColors = File.ReadAllLines(App.RootPath + "Colors\\Dark.ini"); + BtnColorRed.Background = new SolidColorBrush(StringToColor(darkColors[0])); + BtnColorGreen.Background = new SolidColorBrush(StringToColor(darkColors[1])); + BtnColorBlue.Background = new SolidColorBrush(StringToColor(darkColors[2])); + BtnColorYellow.Background = new SolidColorBrush(StringToColor(darkColors[3])); + } + catch (Exception) { ShowNotification("读取深色画笔颜色配置文件时遇到问题"); } } else { From 01aad1f2ca1343be6734243d97487597103a467b Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sun, 19 Nov 2023 11:29:05 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=B0=86=E8=B4=A1=E7=8C=AE=E8=80=85?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20STBBRD(=E6=88=91)=20=E6=94=B9=E4=B8=BA=20Z?= =?UTF-8?q?ongziTEK(=E6=88=91)?= 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 5729d3f7..6dfbf604 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -598,7 +598,7 @@ 开发者: XY Wang (WXRIW) - 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD + 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, ZongziTEK 开源地址: From 525cc8e232b9995936753e0cee3c4e0284f4ccff Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sun, 19 Nov 2023 12:27:31 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E6=89=B9=E6=B3=A8=E4=B8=8B=E6=8C=89=E4=B8=A4=E6=AC=A1=20Alt+E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E6=B5=85=E8=89=B2=E7=94=BB=E7=AC=94=20?= =?UTF-8?q?=E7=9A=84=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.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index a9155d7c..7a2d819f 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -306,7 +306,7 @@ private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e) { if (ImageEraserMask.Visibility == Visibility.Visible) { - BtnColorRed_Click(sender, null); + BorderPenColorRed_MouseUp(null, null); } else { From 7668ad365eda071aa52113bac802b3f36960fd24 Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 25 Nov 2023 20:33:47 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=B0=86=E7=AC=AC=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AD=A6=E5=91=8A=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=9A=84=20MessageBox=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=20Windows=20=E5=85=B3=E6=9C=BA=E6=97=B6?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E8=AD=A6=E5=91=8A=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 7a2d819f..90426c9a 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -534,7 +534,7 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs if (!CloseIsFromButton) { e.Cancel = true; - if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.OK) + if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel) == MessageBoxResult.OK) { if (MessageBox.Show("真的狠心关闭 Ink Canvas 画板吗？", "Ink Canvas 画板", MessageBoxButton.OKCancel, MessageBoxImage.Error) == MessageBoxResult.OK) { From f0c44fe092cc90ccc92b18ac0f5c2b3ed915dba4 Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:14:48 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=A9=A1=E7=9A=AE=E6=97=B6=E9=9A=90=E8=97=8F=E5=86=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=BB=E6=9D=BF=E5=AF=BC=E8=87=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=B5=85=E8=89=B2=E7=94=BB=E7=AC=94=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=AF=B9=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 90426c9a..9670fa0d 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -534,7 +534,7 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs if (!CloseIsFromButton) { e.Cancel = true; - if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel) == MessageBoxResult.OK) + if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel,MessageBoxImage.Warning) == MessageBoxResult.OK) { if (MessageBox.Show("真的狠心关闭 Ink Canvas 画板吗？", "Ink Canvas 画板", MessageBoxButton.OKCancel, MessageBoxImage.Error) == MessageBoxResult.OK) { @@ -6987,8 +6987,6 @@ private void SymbolIconRedo_MouseUp(object sender, MouseButtonEventArgs e) private async void SymbolIconCursor_Click(object sender, RoutedEventArgs e) { - SetDarkColors(); - if (currentMode != 0) { ImageBlackboard_MouseUp(null, null); @@ -7006,6 +7004,8 @@ private async void SymbolIconCursor_Click(object sender, RoutedEventArgs e) } } } + + SetDarkColors(); } private void SymbolIconDelete_MouseUp(object sender, MouseButtonEventArgs e) From f84a4f2e442abceef39089f8a2ab16f9e38032ce Mon Sep 17 00:00:00 2001 From: STBBRD <62409850+STBBRD@users.noreply.github.com> Date: Sat, 23 Dec 2023 20:51:22 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20MainWindow.xaml=20?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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 6dfbf604..e4109535 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -598,7 +598,7 @@ 开发者: XY Wang (WXRIW) - 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, ZongziTEK + 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, ZongziTEK, ChangSakura 开源地址: From 8939eb1e2828058acc49f3f09339c3d02d6ecdd1 Mon Sep 17 00:00:00 2001 From: XY Wang Date: Thu, 14 Mar 2024 16:09:31 +0800 Subject: [PATCH 12/12] Update MainWindow.xaml.cs --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index dc13ed32..b4cdb9bd 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -534,7 +534,7 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs if (!CloseIsFromButton) { e.Cancel = true; - if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel,MessageBoxImage.Warning) == MessageBoxResult.OK) + if (MessageBox.Show("是否继续关闭 Ink Canvas 画板，这将丢失当前未保存的工作。", "Ink Canvas 画板", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.OK) { if (MessageBox.Show("真的狠心关闭 Ink Canvas 画板吗？", "Ink Canvas 画板", MessageBoxButton.OKCancel, MessageBoxImage.Error) == MessageBoxResult.OK) {