From 9eca7eb2eeb9bf797f58c2caad82b794dfea0032 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Wed, 13 Aug 2025 12:16:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E4=B8=8D?= =?UTF-8?q?=E6=8A=98=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_BoardIcons.cs | 1 + Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 10 ++++++++++ Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs | 1 + 3 files changed, 12 insertions(+) diff --git a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs index 96bbe77a..03ee7c86 100644 --- a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs @@ -43,6 +43,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); // 显示背景选项面板 AnimationsHelper.ShowWithSlideFromBottomAndFade(BackgroundPalette); diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 39886fda..167b5556 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -303,6 +303,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BorderDrawShape); AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView); AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); // 隐藏背景设置面板 var bgPalette = LogicalTreeHelper.FindLogicalNode(this, "BackgroundPalette") as Border; @@ -882,6 +883,7 @@ namespace Ink_Canvas RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed; AnimationsHelper.HideWithSlideAndFade(BorderTools); AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); new CountdownTimerWindow().Show(); } @@ -890,6 +892,7 @@ namespace Ink_Canvas { AnimationsHelper.HideWithSlideAndFade(BorderTools); AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); new OperatingGuideWindow().Show(); } @@ -904,6 +907,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BorderTools); AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); new RandWindow(Settings).Show(); } @@ -978,6 +982,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BorderTools); AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); // 检查是否启用了直接调用ClassIsland点名功能 if (Settings.RandSettings.DirectCallCiRand) @@ -1011,6 +1016,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BorderTools); AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); CollapseBorderDrawShape(); @@ -1245,6 +1251,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); } else { @@ -1258,6 +1265,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderTools); AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools); } @@ -1764,6 +1772,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); } else { @@ -1777,6 +1786,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette); AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette); } diff --git a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs index 259b5093..9e520900 100644 --- a/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs +++ b/Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs @@ -54,6 +54,7 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BoardBorderTools); AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel); AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderDrawShape); AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderDrawShape); }