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

将浮动工具栏使用新控件

Browse Source
This commit is contained in:
PrefacedCorg
2026-04-11 13:42:33 +08:00
parent a7fe7937a5
commit 836e0b0fde
4 changed files with 56 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+6 -43
View File
@@ -625,14 +625,8 @@ namespace Ink_Canvas
/// </summary>
/// <param name="sender">发送者</param>
/// <param name="e">鼠标按钮事件参数</param>
internal void SymbolIconUndo_MouseUp(object sender, MouseButtonEventArgs e)
internal void SymbolIconUndo_MouseUp(object sender, RoutedEventArgs e)
{
//if (lastBorderMouseDownObject != sender) return;
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == SymbolIconUndo && lastBorderMouseDownObject != SymbolIconUndo) return;
if (!BtnUndo.IsEnabled) return;
BtnUndo_Click(BtnUndo, null);
HideSubPanels();
@@ -643,14 +637,8 @@ namespace Ink_Canvas
/// </summary>
/// <param name="sender">发送者</param>
/// <param name="e">鼠标按钮事件参数</param>
internal void SymbolIconRedo_MouseUp(object sender, MouseButtonEventArgs e)
internal void SymbolIconRedo_MouseUp(object sender, RoutedEventArgs e)
{
//if (lastBorderMouseDownObject != sender) return;
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == SymbolIconRedo && lastBorderMouseDownObject != SymbolIconRedo) return;
if (!BtnRedo.IsEnabled) return;
BtnRedo_Click(BtnRedo, null);
HideSubPanels();
@@ -670,13 +658,9 @@ namespace Ink_Canvas
/// </summary>
/// <param name="sender">发送者</param>
/// <param name="e">鼠标按钮事件参数</param>
internal void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
internal void ImageBlackboard_MouseUp(object sender, RoutedEventArgs e)
{
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == WhiteboardFloatingBarBtn && lastBorderMouseDownObject != WhiteboardFloatingBarBtn) return;
LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
if (isDisplayingOrHidingBlackboard) return;
@@ -948,13 +932,8 @@ namespace Ink_Canvas
/// </summary>
/// <param name="sender">发送者</param>
/// <param name="e">鼠标按钮事件参数</param>
internal void SymbolIconDelete_MouseUp(object sender, MouseButtonEventArgs e)
internal void SymbolIconDelete_MouseUp(object sender, RoutedEventArgs e)
{
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == SymbolIconDelete && lastBorderMouseDownObject != SymbolIconDelete) return;
if (inkCanvas.GetSelectedStrokes().Count > 0)
{
inkCanvas.Strokes.Remove(inkCanvas.GetSelectedStrokes());
@@ -1026,8 +1005,7 @@ namespace Ink_Canvas
if (sender is Panel panel)
{
lastBorderMouseDownObject = sender;
if (panel == SymbolIconDelete) panel.Background = new SolidColorBrush(Color.FromArgb(28, 127, 29, 29));
else panel.Background = new SolidColorBrush(Color.FromArgb(28, 24, 24, 27));
panel.Background = new SolidColorBrush(Color.FromArgb(28, 24, 24, 27));
}
else if (sender is Border border)
{
@@ -1724,13 +1702,8 @@ namespace Ink_Canvas
/// </summary>
/// <param name="sender">发送者</param>
/// <param name="e">鼠标按钮事件参数</param>
private void SymbolIconTools_MouseUp(object sender, MouseButtonEventArgs e)
private void SymbolIconTools_MouseUp(object sender, RoutedEventArgs e)
{
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == ToolsFloatingBarBtn && lastBorderMouseDownObject != ToolsFloatingBarBtn) return;
if (BorderTools.Visibility == Visibility.Visible)
{
AnimationsHelper.HideWithSlideAndFade(BorderTools);
@@ -1742,11 +1715,6 @@ namespace Ink_Canvas
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderTools);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools);
}
if (sender == ToolsFloatingBarBtn)
{
lastBorderMouseDownObject = null;
}
}
/// <summary>
@@ -2643,11 +2611,6 @@ namespace Ink_Canvas
/// <param name="e">路由事件参数</param>
private void CursorWithDelIcon_Click(object sender, RoutedEventArgs e)
{
if (lastBorderMouseDownObject is Panel panel)
panel.Background = new SolidColorBrush(Colors.Transparent);
if (sender == CursorWithDelFloatingBarBtn && lastBorderMouseDownObject != CursorWithDelFloatingBarBtn) return;
SymbolIconDelete_MouseUp(sender, null);
CursorIcon_Click(null, null);
}
Ink Canvas/MainWindow_cs/MW_ShapeDrawing.cs
+1 -7
View File
@@ -33,14 +33,8 @@ namespace Ink_Canvas
/// 3. 如果形状绘制面板可见，则隐藏它
/// 4. 如果形状绘制面板不可见，则显示它
/// </remarks>
private void ImageDrawShape_MouseUp(object sender, MouseButtonEventArgs e)
private void ImageDrawShape_MouseUp(object sender, RoutedEventArgs e)
{
if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
if (sender == ShapeDrawFloatingBarBtn && lastBorderMouseDownObject != ShapeDrawFloatingBarBtn) return;
// FloatingBarIcons_MouseUp_New(sender);
if (BorderDrawShape.Visibility == Visibility.Visible)
{
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);