diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 5d5920df..961a8552 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -4509,7 +4509,7 @@ Label="上一页" IconGeometry="F1 M24,24z M0,0z M7.40091,10.456L14.5033,3.35357 12.3198,1.17001 1.48978,12 12.3198,22.83 14.5033,20.6465 7.40089,13.544 22.5102,13.544 22.5102,10.456 7.40091,10.456z" IsEnabledBinding="{Binding ElementName=BtnWhiteBoardSwitchPrevious, Path=IsEnabled}" - ButtonMouseUp="BtnWhiteBoardSwitchPrevious_Click" /> + ButtonMouseUp="BoardBtnWhiteBoardSwitchPrevious_MouseUp" /> + ButtonMouseUp="BoardBtnWhiteBoardSwitchNext_MouseUp" /> + ButtonMouseUp="BoardBtnWhiteBoardAdd_MouseUp" /> + ButtonMouseUp="BoardBtnWhiteBoardSwitchPrevious_MouseUp" /> + ButtonMouseUp="BoardBtnWhiteBoardSwitchNext_MouseUp" /> diff --git a/Ink Canvas/MainWindow_cs/MW_BoardControls.cs b/Ink Canvas/MainWindow_cs/MW_BoardControls.cs index b591a79f..337bcc44 100644 --- a/Ink Canvas/MainWindow_cs/MW_BoardControls.cs +++ b/Ink Canvas/MainWindow_cs/MW_BoardControls.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; using System.Windows.Ink; +using System.Windows.Input; using System.Windows.Media; using System.Windows.Threading; @@ -426,7 +427,10 @@ namespace Ink_Canvas /// /// 该方法在切换前会取消当前选中元素（同时保留并恢复编辑模式）、调用视频呈现器的离开页前钩子、保存当前页的笔迹与元素、清空画布；切换到前一页后恢复该页内容、调用视频呈现器的页已更改钩子并刷新页面索引显示。 /// - private void BtnWhiteBoardSwitchPrevious_Click(object sender, MouseButtonEventArgs e) + private void BoardBtnWhiteBoardSwitchPrevious_MouseUp(object sender, MouseButtonEventArgs e) + => BtnWhiteBoardSwitchPrevious_Click(sender, e); + + private void BtnWhiteBoardSwitchPrevious_Click(object sender, RoutedEventArgs e) { if (CurrentWhiteboardIndex <= 1) return; @@ -458,7 +462,10 @@ namespace Ink_Canvas /// /// 触发事件的源对象（通常为按钮）。 /// 事件参数。 - private void BtnWhiteBoardSwitchNext_Click(object sender, MouseButtonEventArgs e) + private void BoardBtnWhiteBoardSwitchNext_MouseUp(object sender, MouseButtonEventArgs e) + => BtnWhiteBoardSwitchNext_Click(sender, e); + + private void BtnWhiteBoardSwitchNext_Click(object sender, RoutedEventArgs e) { if (CurrentWhiteboardIndex < WhiteboardTotalCount && Settings.Automation.IsAutoSaveStrokesAtClear && @@ -505,7 +512,10 @@ namespace Ink_Canvas /// - 将当前页面的历史保存到时间轴并清空画布，然后在白板集合中插入一个空白页面（其历史为 null），随后恢复该页面并触发页面变更回调。 /// - 更新页码显示并在达到上限时禁用添加按钮；若侧边页列表可见，则刷新该列表。 /// - private void BtnWhiteBoardAdd_Click(object sender, MouseButtonEventArgs e) + private void BoardBtnWhiteBoardAdd_MouseUp(object sender, MouseButtonEventArgs e) + => BtnWhiteBoardAdd_Click(sender, e); + + private void BtnWhiteBoardAdd_Click(object sender, RoutedEventArgs e) { if (WhiteboardTotalCount >= 99) return; if (Settings.Automation.IsAutoSaveStrokesAtClear && diff --git a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs index 16e36382..3e083cbe 100644 --- a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs +++ b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs @@ -353,7 +353,7 @@ namespace Ink_Canvas await Task.Delay(150); } - BtnWhiteBoardAdd_Click(null, EventArgs.Empty); + BtnWhiteBoardAdd_Click(null, new RoutedEventArgs()); await InsertBitmapSourceToCanvas(bitmapSourceForClipboard); }