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

add:快捷调色盘

Browse Source
This commit is contained in:
CJKmkp
2025-08-12 11:08:24 +08:00
parent b20dbc5202
commit 636dd2b8d5
4 changed files with 519 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml
+399 -279
View File
@@ -6189,7 +6189,7 @@
<Grid Name="FloatingbarUIForInkReplay"> <Grid Name="FloatingbarUIForInkReplay">
<Viewbox Name="ViewboxFloatingBar" Margin="100,5,0,0" Cursor="Arrow" <Viewbox Name="ViewboxFloatingBar" Margin="100,5,0,0" Cursor="Arrow"
HorizontalAlignment="Left" Height="58" VerticalAlignment="Top" Width="733" HorizontalAlignment="Left" Height="58" VerticalAlignment="Top" Width="850"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Viewbox.LayoutTransform> <Viewbox.LayoutTransform>
<ScaleTransform x:Name="ViewboxFloatingBarScaleTransform" ScaleX="1" ScaleY="1" /> <ScaleTransform x:Name="ViewboxFloatingBarScaleTransform" ScaleX="1" ScaleY="1" />
@@ -6267,290 +6267,410 @@
<!-- 快捷调色盘 --> <!-- 快捷调色盘 -->
<ui:SimpleStackPanel Name="QuickColorPalettePanel" <ui:SimpleStackPanel Name="QuickColorPalettePanel"
Visibility="Collapsed" Visibility="Collapsed"
Orientation="Horizontal" Orientation="Vertical"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="4,0,4,0"> Margin="4,0,4,0"
<!-- 白色 --> Width="60"
<Border Name="QuickColorWhite" Height="42"
Width="16" Height="16" MaxWidth="60"
Background="White" MaxHeight="42">
BorderBrush="#CCCCCC" <!-- 第一行：黑、白、红、橙 -->
BorderThickness="1" <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2">
CornerRadius="8" <!-- 黑色 -->
Margin="1,0,1,0" <Border Name="QuickColorBlack"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" Width="13" Height="13"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" Background="Black"
MouseUp="QuickColorWhite_Click" BorderBrush="#CCCCCC"
ToolTip="白色"> BorderThickness="1"
<Border.Style> CornerRadius="3"
<Style TargetType="Border"> Margin="1,0,1,0"
<Style.Triggers> MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
<Trigger Property="IsMouseOver" Value="True"> MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
<Setter Property="BorderThickness" Value="2"/> MouseUp="QuickColorBlack_Click"
<Setter Property="BorderBrush" Value="#666666"/> ToolTip="黑色">
</Trigger> <Border.Style>
</Style.Triggers> <Style TargetType="Border">
</Style> <Style.Triggers>
</Border.Style> <Trigger Property="IsMouseOver" Value="True">
<!-- 高光效果容器 --> <Setter Property="BorderThickness" Value="2"/>
<Grid> <Setter Property="BorderBrush" Value="#666666"/>
<!-- 高光效果 --> </Trigger>
<Ellipse Name="QuickColorWhiteGlow" </Style.Triggers>
Width="22" Height="22" </Style>
Fill="Transparent" </Border.Style>
Stroke="#FF6B35" <!-- 高光效果容器 -->
StrokeThickness="3" <Grid>
Opacity="1.0" <!-- 高光效果 -->
Visibility="Collapsed" <Rectangle Name="QuickColorBlackGlow"
HorizontalAlignment="Center" Width="17" Height="17"
VerticalAlignment="Center"/> Fill="Transparent"
<!-- 外圈阴影效果 --> Stroke="#00FFFF"
<Ellipse Name="QuickColorWhiteGlowShadow" StrokeThickness="2"
Width="24" Height="24" RadiusX="4" RadiusY="4"
Fill="Transparent" Opacity="1.0"
Stroke="#FFD700" Visibility="Collapsed"
StrokeThickness="2" HorizontalAlignment="Center"
Opacity="1.0" VerticalAlignment="Center"/>
Visibility="Collapsed" <!-- 外圈阴影效果 -->
HorizontalAlignment="Center" <Rectangle Name="QuickColorBlackGlowShadow"
VerticalAlignment="Center"/> Width="19" Height="19"
</Grid> Fill="Transparent"
</Border> Stroke="#FFD700"
StrokeThickness="1"
RadiusX="5" RadiusY="5"
Opacity="1.0"
Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 橙色 --> <!-- 白色 -->
<Border Name="QuickColorOrange" <Border Name="QuickColorWhite"
Width="16" Height="16" Width="13" Height="13"
Background="#FFA500" Background="White"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="8" CornerRadius="3"
Margin="1,0,1,0" Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorOrange_Click" MouseUp="QuickColorWhite_Click"
ToolTip="橙色"> ToolTip="白色">
<Border.Style> <Border.Style>
<Style TargetType="Border"> <Style TargetType="Border">
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/> <Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/> <Setter Property="BorderBrush" Value="#666666"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Border.Style> </Border.Style>
<!-- 高光效果容器 --> <!-- 高光效果容器 -->
<Grid> <Grid>
<!-- 高光效果 --> <!-- 高光效果 -->
<Ellipse Name="QuickColorOrangeGlow" <Rectangle Name="QuickColorWhiteGlow"
Width="22" Height="22" Width="17" Height="17"
Fill="Transparent" Fill="Transparent"
Stroke="#00FF00" Stroke="#FF6B35"
StrokeThickness="3" StrokeThickness="2"
Opacity="1.0" RadiusX="4" RadiusY="4"
Visibility="Collapsed" Opacity="1.0"
HorizontalAlignment="Center" Visibility="Collapsed"
VerticalAlignment="Center"/> HorizontalAlignment="Center"
<!-- 外圈阴影效果 --> VerticalAlignment="Center"/>
<Ellipse Name="QuickColorOrangeGlowShadow" <!-- 外圈阴影效果 -->
Width="24" Height="24" <Rectangle Name="QuickColorWhiteGlowShadow"
Fill="Transparent" Width="19" Height="19"
Stroke="#FFD700" Fill="Transparent"
StrokeThickness="2" Stroke="#FFD700"
Opacity="1.0" StrokeThickness="1"
Visibility="Collapsed" RadiusX="5" RadiusY="5"
HorizontalAlignment="Center" Opacity="1.0"
VerticalAlignment="Center"/> Visibility="Collapsed"
</Grid> HorizontalAlignment="Center"
</Border> VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 黄色 --> <!-- 红色 -->
<Border Name="QuickColorYellow" <Border Name="QuickColorRed"
Width="16" Height="16" Width="13" Height="13"
Background="#FFFF00" Background="#FF0000"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="8" CornerRadius="3"
Margin="1,0,1,0" Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorYellow_Click" MouseUp="QuickColorRed_Click"
ToolTip="黄色"> ToolTip="红色">
<Border.Style> <Border.Style>
<Style TargetType="Border"> <Style TargetType="Border">
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/> <Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/> <Setter Property="BorderBrush" Value="#666666"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Border.Style> </Border.Style>
<!-- 高光效果容器 --> <!-- 高光效果容器 -->
<Grid> <Grid>
<!-- 高光效果 --> <!-- 高光效果 -->
<Ellipse Name="QuickColorYellowGlow" <Rectangle Name="QuickColorRedGlow"
Width="22" Height="22" Width="17" Height="17"
Fill="Transparent" Fill="Transparent"
Stroke="#FF0000" Stroke="#00FF00"
StrokeThickness="3" StrokeThickness="2"
Opacity="1.0" RadiusX="4" RadiusY="4"
Visibility="Collapsed" Opacity="1.0"
HorizontalAlignment="Center" Visibility="Collapsed"
VerticalAlignment="Center"/> HorizontalAlignment="Center"
<!-- 外圈阴影效果 --> VerticalAlignment="Center"/>
<Ellipse Name="QuickColorYellowGlowShadow" <!-- 外圈阴影效果 -->
Width="24" Height="24" <Rectangle Name="QuickColorRedGlowShadow"
Fill="Transparent" Width="19" Height="19"
Stroke="#FFD700" Fill="Transparent"
StrokeThickness="2" Stroke="#FFD700"
Opacity="1.0" StrokeThickness="1"
Visibility="Collapsed" RadiusX="5" RadiusY="5"
HorizontalAlignment="Center" Opacity="1.0"
VerticalAlignment="Center"/> Visibility="Collapsed"
</Grid> HorizontalAlignment="Center"
</Border> VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 黑色 --> <!-- 橙色 -->
<Border Name="QuickColorBlack" <Border Name="QuickColorOrange"
Width="16" Height="16" Width="13" Height="13"
Background="Black" Background="#FFA500"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="8" CornerRadius="3"
Margin="1,0,1,0" Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorBlack_Click" MouseUp="QuickColorOrange_Click"
ToolTip="黑色"> ToolTip="橙色">
<Border.Style> <Border.Style>
<Style TargetType="Border"> <Style TargetType="Border">
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/> <Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/> <Setter Property="BorderBrush" Value="#666666"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Border.Style> </Border.Style>
<!-- 高光效果容器 --> <!-- 高光效果容器 -->
<Grid> <Grid>
<!-- 高光效果 --> <!-- 高光效果 -->
<Ellipse Name="QuickColorBlackGlow" <Rectangle Name="QuickColorOrangeGlow"
Width="22" Height="22" Width="17" Height="17"
Fill="Transparent" Fill="Transparent"
Stroke="#00FFFF" Stroke="#00FF00"
StrokeThickness="3" StrokeThickness="2"
Opacity="1.0" RadiusX="4" RadiusY="4"
Visibility="Collapsed" Opacity="1.0"
HorizontalAlignment="Center" Visibility="Collapsed"
VerticalAlignment="Center"/> HorizontalAlignment="Center"
<!-- 外圈阴影效果 --> VerticalAlignment="Center"/>
<Ellipse Name="QuickColorBlackGlowShadow" <!-- 外圈阴影效果 -->
Width="24" Height="24" <Rectangle Name="QuickColorOrangeGlowShadow"
Fill="Transparent" Width="19" Height="19"
Stroke="#FFD700" Fill="Transparent"
StrokeThickness="2" Stroke="#FFD700"
Opacity="1.0" StrokeThickness="1"
Visibility="Collapsed" RadiusX="5" RadiusY="5"
HorizontalAlignment="Center" Opacity="1.0"
VerticalAlignment="Center"/> Visibility="Collapsed"
</Grid> HorizontalAlignment="Center"
</Border> VerticalAlignment="Center"/>
</Grid>
</Border>
</ui:SimpleStackPanel>
<!-- 蓝色 --> <!-- 第二行：黄、绿、蓝、紫 -->
<Border Name="QuickColorBlue" <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,2,0,0">
Width="16" Height="16" <!-- 黄色 -->
Background="#0066FF" <Border Name="QuickColorYellow"
BorderBrush="#CCCCCC" Width="13" Height="13"
BorderThickness="1" Background="#FFFF00"
CornerRadius="8" BorderBrush="#CCCCCC"
Margin="1,0,1,0" BorderThickness="1"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" CornerRadius="3"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" Margin="1,0,1,0"
MouseUp="QuickColorBlue_Click" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
ToolTip="蓝色"> MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
<Border.Style> MouseUp="QuickColorYellow_Click"
<Style TargetType="Border"> ToolTip="黄色">
<Style.Triggers> <Border.Style>
<Trigger Property="IsMouseOver" Value="True"> <Style TargetType="Border">
<Setter Property="BorderThickness" Value="2"/> <Style.Triggers>
<Setter Property="BorderBrush" Value="#666666"/> <Trigger Property="IsMouseOver" Value="True">
</Trigger> <Setter Property="BorderThickness" Value="2"/>
</Style.Triggers> <Setter Property="BorderBrush" Value="#666666"/>
</Style> </Trigger>
</Border.Style> </Style.Triggers>
<!-- 高光效果容器 --> </Style>
<Grid> </Border.Style>
<!-- 高光效果 --> <!-- 高光效果容器 -->
<Ellipse Name="QuickColorBlueGlow" <Grid>
Width="22" Height="22" <!-- 高光效果 -->
Fill="Transparent" <Rectangle Name="QuickColorYellowGlow"
Stroke="#FF00FF" Width="17" Height="17"
StrokeThickness="3" Fill="Transparent"
Opacity="1.0" Stroke="#FF0000"
Visibility="Collapsed" StrokeThickness="2"
HorizontalAlignment="Center" RadiusX="4" RadiusY="4"
VerticalAlignment="Center"/> Opacity="1.0"
<!-- 外圈阴影效果 --> Visibility="Collapsed"
<Ellipse Name="QuickColorBlueGlowShadow" HorizontalAlignment="Center"
Width="24" Height="24" VerticalAlignment="Center"/>
Fill="Transparent" <!-- 外圈阴影效果 -->
Stroke="#FFD700" <Rectangle Name="QuickColorYellowGlowShadow"
StrokeThickness="2" Width="19" Height="19"
Opacity="1.0" Fill="Transparent"
Visibility="Collapsed" Stroke="#FFD700"
HorizontalAlignment="Center" StrokeThickness="1"
VerticalAlignment="Center"/> RadiusX="5" RadiusY="5"
</Grid> Opacity="1.0"
</Border> Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 红色 --> <!-- 绿色 -->
<Border Name="QuickColorRed" <Border Name="QuickColorGreen"
Width="16" Height="16" Width="13" Height="13"
Background="#FF0000" Background="#00FF00"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="8" CornerRadius="3"
Margin="1,0,1,0" Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorRed_Click" MouseUp="QuickColorGreen_Click"
ToolTip="红色"> ToolTip="绿色">
<Border.Style> <Border.Style>
<Style TargetType="Border"> <Style TargetType="Border">
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/> <Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/> <Setter Property="BorderBrush" Value="#666666"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Border.Style> </Border.Style>
<!-- 高光效果容器 --> <!-- 高光效果容器 -->
<Grid> <Grid>
<!-- 高光效果 --> <!-- 高光效果 -->
<Ellipse Name="QuickColorRedGlow" <Rectangle Name="QuickColorGreenGlow"
Width="22" Height="22" Width="17" Height="17"
Fill="Transparent" Fill="Transparent"
Stroke="#00FF00" Stroke="#FF0000"
StrokeThickness="3" StrokeThickness="2"
Opacity="1.0" RadiusX="4" RadiusY="4"
Visibility="Collapsed" Opacity="1.0"
HorizontalAlignment="Center" Visibility="Collapsed"
VerticalAlignment="Center"/> HorizontalAlignment="Center"
<!-- 外圈阴影效果 --> VerticalAlignment="Center"/>
<Ellipse Name="QuickColorRedGlowShadow" <!-- 外圈阴影效果 -->
Width="24" Height="24" <Rectangle Name="QuickColorGreenGlowShadow"
Fill="Transparent" Width="19" Height="19"
Stroke="#FFD700" Fill="Transparent"
StrokeThickness="2" Stroke="#FFD700"
Opacity="1.0" StrokeThickness="1"
Visibility="Collapsed" RadiusX="5" RadiusY="5"
HorizontalAlignment="Center" Opacity="1.0"
VerticalAlignment="Center"/> Visibility="Collapsed"
</Grid> HorizontalAlignment="Center"
</Border> VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 蓝色 -->
<Border Name="QuickColorBlue"
Width="13" Height="13"
Background="#0066FF"
BorderBrush="#CCCCCC"
BorderThickness="1"
CornerRadius="3"
Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorBlue_Click"
ToolTip="蓝色">
<Border.Style>
<Style TargetType="Border">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/>
</Trigger>
</Style.Triggers>
</Style>
</Border.Style>
<!-- 高光效果容器 -->
<Grid>
<!-- 高光效果 -->
<Rectangle Name="QuickColorBlueGlow"
Width="17" Height="17"
Fill="Transparent"
Stroke="#FF00FF"
StrokeThickness="2"
RadiusX="4" RadiusY="4"
Opacity="1.0"
Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!-- 外圈阴影效果 -->
<Rectangle Name="QuickColorBlueGlowShadow"
Width="19" Height="19"
Fill="Transparent"
Stroke="#FFD700"
StrokeThickness="1"
RadiusX="5" RadiusY="5"
Opacity="1.0"
Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</Border>
<!-- 紫色 -->
<Border Name="QuickColorPurple"
Width="13" Height="13"
Background="#800080"
BorderBrush="#CCCCCC"
BorderThickness="1"
CornerRadius="3"
Margin="1,0,1,0"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorPurple_Click"
ToolTip="紫色">
<Border.Style>
<Style TargetType="Border">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="BorderBrush" Value="#666666"/>
</Trigger>
</Style.Triggers>
</Style>
</Border.Style>
<!-- 高光效果容器 -->
<Grid>
<!-- 高光效果 -->
<Rectangle Name="QuickColorPurpleGlow"
Width="17" Height="17"
Fill="Transparent"
Stroke="#00FFFF"
StrokeThickness="2"
RadiusX="4" RadiusY="4"
Opacity="1.0"
Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
<!-- 外圈阴影效果 -->
<Rectangle Name="QuickColorPurpleGlowShadow"
Width="19" Height="19"
Fill="Transparent"
Stroke="#FFD700"
StrokeThickness="1"
RadiusX="5" RadiusY="5"
Opacity="1.0"
Visibility="Collapsed"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</Grid>
</Border>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="SymbolIconDelete" <ui:SimpleStackPanel Name="SymbolIconDelete"
Ink Canvas/MainWindow.xaml.cs
+7 -1
View File
@@ -73,8 +73,14 @@ namespace Ink_Canvas
ViewBoxStackPanelMain.Visibility = Visibility.Collapsed; ViewBoxStackPanelMain.Visibility = Visibility.Collapsed;
ViewBoxStackPanelShapes.Visibility = Visibility.Collapsed; ViewBoxStackPanelShapes.Visibility = Visibility.Collapsed;
var workingArea = Screen.PrimaryScreen.WorkingArea; var workingArea = Screen.PrimaryScreen.WorkingArea;
// 考虑快捷调色盘的宽度，确保浮动栏有足够空间
double floatingBarWidth = 284; // 基础宽度
if (Settings.Appearance.IsShowQuickColorPalette)
{
floatingBarWidth = Math.Max(floatingBarWidth, 820); // 快捷调色盘显示时的宽度
}
ViewboxFloatingBar.Margin = new Thickness( ViewboxFloatingBar.Margin = new Thickness(
(workingArea.Width - 284) / 2, (workingArea.Width - floatingBarWidth) / 2,
workingArea.Bottom - 60 - workingArea.Top, workingArea.Bottom - 60 - workingArea.Top,
-2000, -200); -2000, -200);
ViewboxFloatingBarMarginAnimation(100, true); ViewboxFloatingBarMarginAnimation(100, true);
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+86 -3
View File
@@ -831,6 +831,12 @@ namespace Ink_Canvas
case "QuickColorRed": case "QuickColorRed":
border.Background = new SolidColorBrush(Colors.Red); border.Background = new SolidColorBrush(Colors.Red);
break; break;
case "QuickColorGreen":
border.Background = new SolidColorBrush(Colors.Green);
break;
case "QuickColorPurple":
border.Background = new SolidColorBrush(Color.FromRgb(128, 0, 128));
break;
} }
} }
else else
@@ -1262,7 +1268,18 @@ namespace Ink_Canvas
double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY; double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
// 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
// 计算浮动栏位置，考虑快捷调色盘的显示状态
double floatingBarWidth = ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX;
// 如果快捷调色盘显示，确保有足够空间
if (QuickColorPalettePanel != null && QuickColorPalettePanel.Visibility == Visibility.Visible)
{
// 确保浮动栏有足够宽度容纳快捷调色盘
floatingBarWidth = Math.Max(floatingBarWidth, 820 * ViewboxFloatingBarScaleTransform.ScaleX);
}
pos.X = (screenWidth - floatingBarWidth) / 2;
if (PosXCaculatedWithTaskbarHeight == false) if (PosXCaculatedWithTaskbarHeight == false)
{ {
@@ -1356,7 +1373,18 @@ namespace Ink_Canvas
double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY; double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
// 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
// 计算浮动栏位置，考虑快捷调色盘的显示状态
double floatingBarWidth = ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX;
// 如果快捷调色盘显示，确保有足够空间
if (QuickColorPalettePanel != null && QuickColorPalettePanel.Visibility == Visibility.Visible)
{
// 确保浮动栏有足够宽度容纳快捷调色盘
floatingBarWidth = Math.Max(floatingBarWidth, 820 * ViewboxFloatingBarScaleTransform.ScaleX);
}
pos.X = (screenWidth - floatingBarWidth) / 2;
// 如果任务栏高度为0(隐藏状态),则使用固定边距 // 如果任务栏高度为0(隐藏状态),则使用固定边距
if (toolbarHeight == 0) if (toolbarHeight == 0)
@@ -1411,7 +1439,18 @@ namespace Ink_Canvas
double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY; double screenWidth = screen.Bounds.Width / dpiScaleX, screenHeight = screen.Bounds.Height / dpiScaleY;
// 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响 // 仅计算Windows任务栏高度，不考虑其他程序对工作区的影响
var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY); var toolbarHeight = ForegroundWindowInfo.GetTaskbarHeight(screen, dpiScaleY);
pos.X = (screenWidth - ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX) / 2;
// 计算浮动栏位置，考虑快捷调色盘的显示状态
double floatingBarWidth = ViewboxFloatingBar.ActualWidth * ViewboxFloatingBarScaleTransform.ScaleX;
// 如果快捷调色盘显示，确保有足够空间
if (QuickColorPalettePanel != null && QuickColorPalettePanel.Visibility == Visibility.Visible)
{
// 确保浮动栏有足够宽度容纳快捷调色盘
floatingBarWidth = Math.Max(floatingBarWidth, 820 * ViewboxFloatingBarScaleTransform.ScaleX);
}
pos.X = (screenWidth - floatingBarWidth) / 2;
pos.Y = screenHeight - 55 * ViewboxFloatingBarScaleTransform.ScaleY; pos.Y = screenHeight - 55 * ViewboxFloatingBarScaleTransform.ScaleY;
@@ -1525,6 +1564,12 @@ namespace Ink_Canvas
StackPanelCanvasControls.Visibility = Visibility.Collapsed; StackPanelCanvasControls.Visibility = Visibility.Collapsed;
// 在鼠标模式下隐藏快捷调色盘
if (QuickColorPalettePanel != null)
{
QuickColorPalettePanel.Visibility = Visibility.Collapsed;
}
if (!isFloatingBarFolded) if (!isFloatingBarFolded)
{ {
HideSubPanels("cursor", true); HideSubPanels("cursor", true);
@@ -1601,6 +1646,12 @@ namespace Ink_Canvas
CheckEnableTwoFingerGestureBtnVisibility(true); CheckEnableTwoFingerGestureBtnVisibility(true);
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
// 在批注模式下显示快捷调色盘（如果设置中启用了）
if (Settings.Appearance.IsShowQuickColorPalette && QuickColorPalettePanel != null)
{
QuickColorPalettePanel.Visibility = Visibility.Visible;
}
// 修复：从线擦切换到批注时，重置为默认笔模式（非高光显示） // 修复：从线擦切换到批注时，重置为默认笔模式（非高光显示）
forceEraser = false; forceEraser = false;
forcePointEraser = false; forcePointEraser = false;
@@ -1849,6 +1900,16 @@ namespace Ink_Canvas
SetQuickColor(Colors.Red); SetQuickColor(Colors.Red);
} }
private void QuickColorGreen_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Colors.Green);
}
private void QuickColorPurple_Click(object sender, RoutedEventArgs e)
{
SetQuickColor(Color.FromRgb(128, 0, 128));
}
private void SetQuickColor(Color color) private void SetQuickColor(Color color)
{ {
// 确保当前处于批注模式 // 确保当前处于批注模式
@@ -1871,6 +1932,8 @@ namespace Ink_Canvas
else if (color == Colors.Black) lastDesktopInkColor = 0; else if (color == Colors.Black) lastDesktopInkColor = 0;
else if (color == Color.FromRgb(0, 102, 255)) lastDesktopInkColor = 3; // 蓝色 else if (color == Color.FromRgb(0, 102, 255)) lastDesktopInkColor = 3; // 蓝色
else if (color == Colors.Red) lastDesktopInkColor = 1; else if (color == Colors.Red) lastDesktopInkColor = 1;
else if (color == Colors.Green) lastDesktopInkColor = 2; // 绿色
else if (color == Color.FromRgb(128, 0, 128)) lastDesktopInkColor = 6; // 紫色
} }
else else
{ {
@@ -1881,6 +1944,8 @@ namespace Ink_Canvas
else if (color == Colors.Black) lastBoardInkColor = 0; else if (color == Colors.Black) lastBoardInkColor = 0;
else if (color == Color.FromRgb(0, 102, 255)) lastBoardInkColor = 3; // 蓝色 else if (color == Color.FromRgb(0, 102, 255)) lastBoardInkColor = 3; // 蓝色
else if (color == Colors.Red) lastBoardInkColor = 1; else if (color == Colors.Red) lastBoardInkColor = 1;
else if (color == Colors.Green) lastBoardInkColor = 2; // 绿色
else if (color == Color.FromRgb(128, 0, 128)) lastBoardInkColor = 6; // 紫色
} }
// 更新快捷调色盘选择指示器 // 更新快捷调色盘选择指示器
@@ -1905,6 +1970,10 @@ namespace Ink_Canvas
QuickColorBlueGlowShadow.Visibility = Visibility.Collapsed; QuickColorBlueGlowShadow.Visibility = Visibility.Collapsed;
QuickColorRedGlow.Visibility = Visibility.Collapsed; QuickColorRedGlow.Visibility = Visibility.Collapsed;
QuickColorRedGlowShadow.Visibility = Visibility.Collapsed; QuickColorRedGlowShadow.Visibility = Visibility.Collapsed;
QuickColorGreenGlow.Visibility = Visibility.Collapsed;
QuickColorGreenGlowShadow.Visibility = Visibility.Collapsed;
QuickColorPurpleGlow.Visibility = Visibility.Collapsed;
QuickColorPurpleGlowShadow.Visibility = Visibility.Collapsed;
// 显示当前选中颜色的高光效果和外圈阴影 // 显示当前选中颜色的高光效果和外圈阴影
// 使用更精确的颜色匹配，减少容差范围避免误判 // 使用更精确的颜色匹配，减少容差范围避免误判
@@ -1947,6 +2016,20 @@ namespace Ink_Canvas
QuickColorRedGlow.Visibility = Visibility.Visible; QuickColorRedGlow.Visibility = Visibility.Visible;
QuickColorRedGlowShadow.Visibility = Visibility.Visible; QuickColorRedGlowShadow.Visibility = Visibility.Visible;
} }
else if (IsColorSimilar(selectedColor, Colors.Green, 15) ||
IsColorSimilar(selectedColor, Color.FromRgb(34, 197, 94), 15) ||
IsColorSimilar(selectedColor, Color.FromRgb(22, 163, 74), 15))
{
QuickColorGreenGlow.Visibility = Visibility.Visible;
QuickColorGreenGlowShadow.Visibility = Visibility.Visible;
}
else if (IsColorSimilar(selectedColor, Color.FromRgb(128, 0, 128), 15) ||
IsColorSimilar(selectedColor, Color.FromRgb(147, 51, 234), 15) ||
IsColorSimilar(selectedColor, Color.FromRgb(168, 85, 247), 15))
{
QuickColorPurpleGlow.Visibility = Visibility.Visible;
QuickColorPurpleGlowShadow.Visibility = Visibility.Visible;
}
} }
/// <summary> /// <summary>
Ink Canvas/MainWindow_cs/MW_Settings.cs
+22 -1
View File
@@ -2454,7 +2454,28 @@ namespace Ink_Canvas
// 快捷调色盘 // 快捷调色盘
if (QuickColorPalettePanel != null) if (QuickColorPalettePanel != null)
QuickColorPalettePanel.Visibility = Settings.Appearance.IsShowQuickColorPalette ? Visibility.Visible : Visibility.Collapsed; {
bool shouldShow = Settings.Appearance.IsShowQuickColorPalette && inkCanvas.EditingMode == InkCanvasEditingMode.Ink;
bool wasVisible = QuickColorPalettePanel.Visibility == Visibility.Visible;
if (shouldShow)
{
QuickColorPalettePanel.Visibility = Visibility.Visible;
}
else
{
QuickColorPalettePanel.Visibility = Visibility.Collapsed;
}
// 如果快捷调色盘的可见性发生变化，重新计算浮动栏位置
if (wasVisible != shouldShow && !isFloatingBarFolded)
{
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
ViewboxFloatingBarMarginAnimation(60);
else
ViewboxFloatingBarMarginAnimation(100, true);
}
}
// 套索选择按钮 // 套索选择按钮
if (SymbolIconSelect != null) if (SymbolIconSelect != null)