From 3dc3e9b5a8d5ca99181de21fab2ffb2971f659db Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Fri, 31 Oct 2025 10:49:10 +0800
Subject: [PATCH] Update MW_FloatingBarIcons.cs

---
 .../MainWindow_cs/MW_FloatingBarIcons.cs      | 68 +++----------------
 1 file changed, 8 insertions(+), 60 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 86d0cd27..42680be6 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -1085,20 +1085,11 @@ namespace Ink_Canvas
             AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
             AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
 
-            // 根据设置决定使用哪个点名窗口
-            if (Settings.RandSettings.UseNewRollCallUI)
-            {
-                // 使用新点名UI - 随机抽模式
-                new NewStyleRollCallWindow(Settings, false).ShowDialog();
-            }
-            else
-            {
-                // 使用默认的随机点名窗口
-                var randWindow = new RandWindow(Settings);
-                randWindow.Show();
+            var randWindow = new RandWindow(Settings);
+            randWindow.Show();
 
-                // 使用延迟确保窗口完全显示后再强制置顶
-                randWindow.Dispatcher.BeginInvoke(new Action(() =>
+            // 使用延迟确保窗口完全显示后再强制置顶
+            randWindow.Dispatcher.BeginInvoke(new Action(() =>
             {
                 try
                 {
@@ -1135,7 +1126,6 @@ namespace Ink_Canvas
                     LogHelper.WriteLogToFile($"强制置顶RandWindow失败: {ex.Message}", LogHelper.LogType.Error);
                 }
             }), DispatcherPriority.Loaded);
-            }
         }
 
         public void CheckEraserTypeTab()
@@ -1242,30 +1232,14 @@ namespace Ink_Canvas
                 {
                     MessageBox.Show("无法调用外部点名：" + ex.Message);
 
-                    // 调用失败时回退到相应的点名窗口
-                    if (Settings.RandSettings.UseNewRollCallUI)
-                    {
-                        new NewStyleRollCallWindow(Settings, true).ShowDialog(); // 单次抽模式
-                    }
-                    else
-                    {
-                        new RandWindow(Settings, true).ShowDialog();
-                    }
+                    // 调用失败时回退到默认的随机点名窗口
+                    new RandWindow(Settings, true).ShowDialog();
                 }
             }
             else
             {
-                // 根据设置决定使用哪个点名窗口
-                if (Settings.RandSettings.UseNewRollCallUI)
-                {
-                    // 使用新点名UI - 单次抽模式
-                    new NewStyleRollCallWindow(Settings, true).ShowDialog();
-                }
-                else
-                {
-                    // 使用默认的随机点名窗口
-                    new RandWindow(Settings, true).ShowDialog();
-                }
+                // 使用默认的随机点名窗口
+                new RandWindow(Settings, true).ShowDialog();
             }
         }
 
@@ -2869,36 +2843,10 @@ namespace Ink_Canvas
             CancelSingleFingerDragMode();
 
             if (Settings.Canvas.ClearCanvasAndClearTimeMachine) timeMachine.ClearStrokeHistory();
-
-            if (Settings.Gesture.IsEnableMultiTouchMode && ToggleSwitchEnableMultiTouchMode != null && ToggleSwitchEnableMultiTouchMode.IsOn)
-            {
-                ReinitializeMultiTouchMode();
-            }
         }
 
         private bool lastIsInMultiTouchMode;
 
-        private void ReinitializeMultiTouchMode()
-        {
-            try
-            {
-                if (!isInMultiTouchMode)
-                {
-                    isInMultiTouchMode = true;
-                }
-
-                inkCanvas.TouchDown -= Main_Grid_TouchDown;
-                inkCanvas.TouchDown += MainWindow_TouchDown;
-                inkCanvas.StylusDown += MainWindow_StylusDown;
-                inkCanvas.StylusMove += MainWindow_StylusMove;
-                inkCanvas.StylusUp += MainWindow_StylusUp;
-
-            }
-            catch (Exception)
-            {
-            }
-        }
-
         private void CancelSingleFingerDragMode()
         {
             if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) CollapseBorderDrawShape();