优化代码

This commit is contained in:
2025-08-31 09:00:32 +08:00
parent 1bc23af61a
commit 26cd125534
4 changed files with 2 additions and 16 deletions
@@ -19,7 +19,6 @@ namespace Ink_Canvas
private FrameworkElement currentSelectedElement; private FrameworkElement currentSelectedElement;
private bool isDragging = false; private bool isDragging = false;
private Point dragStartPoint; private Point dragStartPoint;
private bool isElementSelected = false;
#region Image #region Image
private async void BtnImageInsert_Click(object sender, RoutedEventArgs e) private async void BtnImageInsert_Click(object sender, RoutedEventArgs e)
@@ -253,7 +252,6 @@ namespace Ink_Canvas
private void SelectElement(FrameworkElement element) private void SelectElement(FrameworkElement element)
{ {
currentSelectedElement = element; currentSelectedElement = element;
isElementSelected = true;
// 根据元素类型显示不同的选择工具栏 // 根据元素类型显示不同的选择工具栏
if (element is Image) if (element is Image)
@@ -307,7 +305,6 @@ namespace Ink_Canvas
private void UnselectElement(FrameworkElement element) private void UnselectElement(FrameworkElement element)
{ {
// 去除选中效果 // 去除选中效果
isElementSelected = false;
// 隐藏所有选择工具栏 // 隐藏所有选择工具栏
if (BorderImageSelectionControl != null) if (BorderImageSelectionControl != null)
@@ -2802,7 +2802,7 @@ namespace Ink_Canvas
await Task.Delay(100); await Task.Delay(100);
// Capture screenshot and insert to canvas // Capture screenshot and insert to canvas
await CaptureScreenshotAndInsert(); CaptureScreenshotAndInsert();
} }
private async void ImageOptionSelectFile_MouseUp(object sender, MouseButtonEventArgs e) private async void ImageOptionSelectFile_MouseUp(object sender, MouseButtonEventArgs e)
-11
View File
@@ -76,15 +76,11 @@ namespace Ink_Canvas
#region PPT State Management #region PPT State Management
private bool wasFloatingBarFoldedWhenEnterSlideShow; private bool wasFloatingBarFoldedWhenEnterSlideShow;
private static bool hasShownWpsForceCloseWarning = false;
private bool isEnteredSlideShowEndEvent; //防止重复调用本函数导致墨迹保存失效 private bool isEnteredSlideShowEndEvent; //防止重复调用本函数导致墨迹保存失效
private bool isPresentationHaveBlackSpace; private bool isPresentationHaveBlackSpace;
private string pptName;
private bool _isPptClickingBtnTurned;
// 长按翻页相关字段 // 长按翻页相关字段
private DispatcherTimer _longPressTimer; private DispatcherTimer _longPressTimer;
private bool _isLongPressActive = false;
private bool _isLongPressNext = true; // true为下一页,false为上一页 private bool _isLongPressNext = true; // true为下一页,false为上一页
private const int LongPressDelay = 15; // 长按延迟时间(毫秒) private const int LongPressDelay = 15; // 长按延迟时间(毫秒)
private const int LongPressInterval = 15; // 长按翻页间隔(毫秒) private const int LongPressInterval = 15; // 长按翻页间隔(毫秒)
@@ -202,7 +198,6 @@ namespace Ink_Canvas
if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return; if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return;
_isLongPressNext = isNext; _isLongPressNext = isNext;
_isLongPressActive = false;
_longPressTimer?.Start(); _longPressTimer?.Start();
} }
@@ -212,7 +207,6 @@ namespace Ink_Canvas
private void StopLongPressDetection() private void StopLongPressDetection()
{ {
_longPressTimer?.Stop(); _longPressTimer?.Stop();
_isLongPressActive = false;
} }
/// <summary> /// <summary>
@@ -222,7 +216,6 @@ namespace Ink_Canvas
{ {
if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return; if (!Settings.PowerPointSettings.EnablePPTButtonLongPressPageTurn) return;
_isLongPressActive = true;
_longPressTimer.Interval = TimeSpan.FromMilliseconds(LongPressInterval); _longPressTimer.Interval = TimeSpan.FromMilliseconds(LongPressInterval);
// 执行翻页 // 执行翻页
@@ -846,8 +839,6 @@ namespace Ink_Canvas
{ {
try try
{ {
_isPptClickingBtnTurned = true;
// 保存当前页墨迹 // 保存当前页墨迹
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0) if (currentSlide > 0)
@@ -889,8 +880,6 @@ namespace Ink_Canvas
{ {
try try
{ {
_isPptClickingBtnTurned = true;
// 保存当前页墨迹 // 保存当前页墨迹
var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0; var currentSlide = _pptManager?.GetCurrentSlideNumber() ?? 0;
if (currentSlide > 0) if (currentSlide > 0)
+1 -1
View File
@@ -340,7 +340,7 @@ namespace Ink_Canvas
#endregion #endregion
private int lastTouchDownTime = 0, lastTouchUpTime = 0;
private Point iniP = new Point(0, 0); private Point iniP = new Point(0, 0);