diff --git a/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs b/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs index 0986d973..cb991b8e 100644 --- a/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs +++ b/Ink Canvas/MainWindow_cs/MW_ElementsControls.cs @@ -19,7 +19,6 @@ namespace Ink_Canvas private FrameworkElement currentSelectedElement; private bool isDragging = false; private Point dragStartPoint; - private bool isElementSelected = false; #region Image private async void BtnImageInsert_Click(object sender, RoutedEventArgs e) @@ -253,7 +252,6 @@ namespace Ink_Canvas private void SelectElement(FrameworkElement element) { currentSelectedElement = element; - isElementSelected = true; // 根据元素类型显示不同的选择工具栏 if (element is Image) @@ -307,7 +305,6 @@ namespace Ink_Canvas private void UnselectElement(FrameworkElement element) { // 去除选中效果 - isElementSelected = false; // 隐藏所有选择工具栏 if (BorderImageSelectionControl != null) diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 29e6fd09..2bc43aad 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -2802,7 +2802,7 @@ namespace Ink_Canvas await Task.Delay(100); // Capture screenshot and insert to canvas - await CaptureScreenshotAndInsert(); + CaptureScreenshotAndInsert(); } private async void ImageOptionSelectFile_MouseUp(object sender, MouseButtonEventArgs e) diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index f3c05cab..ea3ac813 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -76,15 +76,11 @@ namespace Ink_Canvas #region PPT State Management private bool wasFloatingBarFoldedWhenEnterSlideShow; - private static bool hasShownWpsForceCloseWarning = false; private bool isEnteredSlideShowEndEvent; //防止重复调用本函数导致墨迹保存失效 private bool isPresentationHaveBlackSpace; - private string pptName; - private bool _isPptClickingBtnTurned; // 长按翻页相关字段 private DispatcherTimer _longPressTimer; - private bool _isLongPressActive = false; private bool _isLongPressNext = true; // true为下一页,false为上一页 private const int LongPressDelay = 15; // 长按延迟时间(毫秒) private const int LongPressInterval = 15; // 长按翻页间隔(毫秒) @@ -202,7 +198,6 @@ namespace Ink_Canvas if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return; _isLongPressNext = isNext; - _isLongPressActive = false; _longPressTimer?.Start(); } @@ -212,7 +207,6 @@ namespace Ink_Canvas private void StopLongPressDetection() { _longPressTimer?.Stop(); - _isLongPressActive = false; } /// @@ -222,7 +216,6 @@ namespace Ink_Canvas { if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return; - _isLongPressActive = true; _longPressTimer.Interval = TimeSpan.FromMilliseconds(LongPressInterval); // 执行翻页 @@ -846,8 +839,6 @@ namespace Ink_Canvas { try { - _isPptClickingBtnTurned = true; - // 保存当前页墨迹 var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; if (currentSlide > 0) @@ -889,8 +880,6 @@ namespace Ink_Canvas { try { - _isPptClickingBtnTurned = true; - // 保存当前页墨迹 var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; if (currentSlide > 0) diff --git a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs index a36e7a47..42ae0582 100644 --- a/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs +++ b/Ink Canvas/MainWindow_cs/MW_TouchEvents.cs @@ -340,7 +340,7 @@ namespace Ink_Canvas #endregion - private int lastTouchDownTime = 0, lastTouchUpTime = 0; + private Point iniP = new Point(0, 0);