代码优化
This commit is contained in:
@@ -66,7 +66,6 @@ namespace Ink_Canvas
|
|||||||
private WindowOverviewModel _windowOverviewModel;
|
private WindowOverviewModel _windowOverviewModel;
|
||||||
|
|
||||||
// 设置面板相关状态
|
// 设置面板相关状态
|
||||||
private bool userChangedNoFocusModeInSettings;
|
|
||||||
private bool isTemporarilyDisablingNoFocusMode = false;
|
private bool isTemporarilyDisablingNoFocusMode = false;
|
||||||
|
|
||||||
// 全屏处理状态标志
|
// 全屏处理状态标志
|
||||||
@@ -2464,11 +2463,6 @@ namespace Ink_Canvas
|
|||||||
ApplyAlwaysOnTop();
|
ApplyAlwaysOnTop();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果当前在设置面板中,标记用户已修改无焦点模式设置
|
|
||||||
if (BorderSettings.Visibility == Visibility.Visible)
|
|
||||||
{
|
|
||||||
userChangedNoFocusModeInSettings = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
|
private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
|
||||||
|
|||||||
@@ -2872,7 +2872,6 @@ namespace Ink_Canvas
|
|||||||
}
|
}
|
||||||
|
|
||||||
private bool isOpeningOrHidingSettingsPane;
|
private bool isOpeningOrHidingSettingsPane;
|
||||||
private bool wasNoFocusModeBeforeSettings;
|
|
||||||
|
|
||||||
private void BtnSettings_Click(object sender, RoutedEventArgs e)
|
private void BtnSettings_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
// 页面切换防抖机制
|
// 页面切换防抖机制
|
||||||
private DateTime _lastSlideSwitchTime = DateTime.MinValue;
|
private DateTime _lastSlideSwitchTime = DateTime.MinValue;
|
||||||
private int _pendingSlideIndex = -1;
|
|
||||||
private const int SlideSwitchDebounceMs = 150;
|
private const int SlideSwitchDebounceMs = 150;
|
||||||
private bool _isInkClearedByButton = false;
|
private bool _isInkClearedByButton = false;
|
||||||
#endregion
|
#endregion
|
||||||
@@ -1226,7 +1225,6 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
// 重置页面切换防抖机制
|
// 重置页面切换防抖机制
|
||||||
_lastSlideSwitchTime = DateTime.MinValue;
|
_lastSlideSwitchTime = DateTime.MinValue;
|
||||||
_pendingSlideIndex = -1;
|
|
||||||
|
|
||||||
LogHelper.WriteLogToFile("PPT状态变量已重置", LogHelper.LogType.Trace);
|
LogHelper.WriteLogToFile("PPT状态变量已重置", LogHelper.LogType.Trace);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ namespace Ink_Canvas
|
|||||||
private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
|
private InkCanvasEditingMode lastInkCanvasEditingMode = InkCanvasEditingMode.Ink;
|
||||||
private DateTime lastTouchDownTime = DateTime.MinValue;
|
private DateTime lastTouchDownTime = DateTime.MinValue;
|
||||||
private const double MULTI_TOUCH_DELAY_MS = 100;
|
private const double MULTI_TOUCH_DELAY_MS = 100;
|
||||||
private bool isMultiTouchTimerActive = false;
|
|
||||||
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// 保存画布上的非笔画元素(如图片、媒体元素等)
|
/// 保存画布上的非笔画元素(如图片、媒体元素等)
|
||||||
@@ -572,12 +571,6 @@ namespace Ink_Canvas
|
|||||||
inkCanvas.EditingMode = lastInkCanvasEditingMode;
|
inkCanvas.EditingMode = lastInkCanvasEditingMode;
|
||||||
dec.Remove(e.TouchDevice.Id);
|
dec.Remove(e.TouchDevice.Id);
|
||||||
|
|
||||||
// 重置多触控点定时器状态
|
|
||||||
if (dec.Count <= 1)
|
|
||||||
{
|
|
||||||
isMultiTouchTimerActive = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dec.Count == 0)
|
if (dec.Count == 0)
|
||||||
{
|
{
|
||||||
isSingleFingerDragMode = false;
|
isSingleFingerDragMode = false;
|
||||||
|
|||||||
@@ -96,7 +96,6 @@ namespace Ink_Canvas.Windows
|
|||||||
private bool _isExpanded = false;
|
private bool _isExpanded = false;
|
||||||
private bool _isDragging = false;
|
private bool _isDragging = false;
|
||||||
private Point _dragStartPoint;
|
private Point _dragStartPoint;
|
||||||
private double _panelWidth = 230; // 面板总宽度(30 + 200)
|
|
||||||
private double _collapsedOffset = 200; // 折叠时的偏移量(隐藏内容区域)
|
private double _collapsedOffset = 200; // 折叠时的偏移量(隐藏内容区域)
|
||||||
private MainWindow _mainWindow;
|
private MainWindow _mainWindow;
|
||||||
|
|
||||||
|
|||||||
@@ -222,7 +222,6 @@ namespace Ink_Canvas
|
|||||||
{
|
{
|
||||||
animationPool.Add(num);
|
animationPool.Add(num);
|
||||||
}
|
}
|
||||||
int lastDisplayedIndex = -1;
|
|
||||||
|
|
||||||
for (int i = 0; i < RandWaitingTimes; i++)
|
for (int i = 0; i < RandWaitingTimes; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user