Update MW_FloatingBarIcons.cs
This commit is contained in:
@@ -1085,15 +1085,6 @@ 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();
|
||||
|
||||
@@ -1136,7 +1127,6 @@ namespace Ink_Canvas
|
||||
}
|
||||
}), DispatcherPriority.Loaded);
|
||||
}
|
||||
}
|
||||
|
||||
public void CheckEraserTypeTab()
|
||||
{
|
||||
@@ -1242,32 +1232,16 @@ namespace Ink_Canvas
|
||||
{
|
||||
MessageBox.Show("无法调用外部点名:" + ex.Message);
|
||||
|
||||
// 调用失败时回退到相应的点名窗口
|
||||
if (Settings.RandSettings.UseNewRollCallUI)
|
||||
{
|
||||
new NewStyleRollCallWindow(Settings, true).ShowDialog(); // 单次抽模式
|
||||
}
|
||||
else
|
||||
{
|
||||
// 调用失败时回退到默认的随机点名窗口
|
||||
new RandWindow(Settings, true).ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 根据设置决定使用哪个点名窗口
|
||||
if (Settings.RandSettings.UseNewRollCallUI)
|
||||
{
|
||||
// 使用新点名UI - 单次抽模式
|
||||
new NewStyleRollCallWindow(Settings, true).ShowDialog();
|
||||
}
|
||||
else
|
||||
{
|
||||
// 使用默认的随机点名窗口
|
||||
new RandWindow(Settings, true).ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user