CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beta' of https://github.com/InkCanvasForClass/community into beta

Browse Source
This commit is contained in:
CJKmkp
2025-10-06 16:39:08 +08:00
parent 9721ec1f0b ef2dbdc93b
commit adc2d02fbb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+3 -4
View File
@@ -383,7 +383,7 @@ namespace Ink_Canvas
var slideAnimation = new DoubleAnimation var slideAnimation = new DoubleAnimation
{ {
From = 0, // 滑动距离 From = 0, // 滑动距离
To = BorderSettings.RenderTransform.Value.OffsetX - 440, To = BorderSettings.RenderTransform.Value.OffsetX - 490,
Duration = TimeSpan.FromSeconds(0.6) Duration = TimeSpan.FromSeconds(0.6)
}; };
slideAnimation.EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }; slideAnimation.EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut };
@@ -407,7 +407,6 @@ namespace Ink_Canvas
// 如果用户在设置中修改了无焦点模式，则保持用户的修改 // 如果用户在设置中修改了无焦点模式，则保持用户的修改
}; };
BorderSettings.Visibility = Visibility.Visible;
BorderSettings.RenderTransform = new TranslateTransform(); BorderSettings.RenderTransform = new TranslateTransform();
isOpeningOrHidingSettingsPane = true; isOpeningOrHidingSettingsPane = true;
@@ -2777,6 +2776,7 @@ namespace Ink_Canvas
} }
else else
{ {
BorderSettings.Visibility = Visibility.Visible;
// 临时禁用无焦点模式以避免下拉选项被遮挡 // 临时禁用无焦点模式以避免下拉选项被遮挡
wasNoFocusModeBeforeSettings = Settings.Advanced.IsNoFocusMode; wasNoFocusModeBeforeSettings = Settings.Advanced.IsNoFocusMode;
userChangedNoFocusModeInSettings = false; // 重置用户修改标志 userChangedNoFocusModeInSettings = false; // 重置用户修改标志
@@ -2795,7 +2795,7 @@ namespace Ink_Canvas
// 滑动动画 // 滑动动画
var slideAnimation = new DoubleAnimation var slideAnimation = new DoubleAnimation
{ {
From = BorderSettings.RenderTransform.Value.OffsetX - 440, // 滑动距离 From = BorderSettings.RenderTransform.Value.OffsetX - 490, // 滑动距离
To = 0, To = 0,
Duration = TimeSpan.FromSeconds(0.6) Duration = TimeSpan.FromSeconds(0.6)
}; };
@@ -2807,7 +2807,6 @@ namespace Ink_Canvas
sb.Completed += (s, _) => { isOpeningOrHidingSettingsPane = false; }; sb.Completed += (s, _) => { isOpeningOrHidingSettingsPane = false; };
BorderSettings.Visibility = Visibility.Visible;
BorderSettings.RenderTransform = new TranslateTransform(); BorderSettings.RenderTransform = new TranslateTransform();
isOpeningOrHidingSettingsPane = true; isOpeningOrHidingSettingsPane = true;