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

improve:快捷调色盘

Browse Source
This commit is contained in:
CJKmkp
2025-08-12 12:30:48 +08:00
parent 0478949305
commit 7329c0097c
1 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow.xaml
+46 -31
View File
@@ -6200,7 +6200,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="850" HorizontalAlignment="Left" Height="58" VerticalAlignment="Top" MinWidth="200" MaxWidth="1200"
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" />
@@ -6217,7 +6217,8 @@
<Border Margin="2,0,0,0" Padding="2" Visibility="Visible" Height="36" <Border Margin="2,0,0,0" Padding="2" Visibility="Visible" Height="36"
Name="BorderFloatingBarMainControls" Background="#fafafa" CornerRadius="5" Name="BorderFloatingBarMainControls" Background="#fafafa" CornerRadius="5"
BorderThickness="1" BorderThickness="1"
BorderBrush="#9952525b"> BorderBrush="#9952525b"
HorizontalAlignment="Left">
<Grid> <Grid>
<Canvas Name="FloatingbarSelectionBGCanvas" Margin="2,0,2,0"> <Canvas Name="FloatingbarSelectionBGCanvas" Margin="2,0,2,0">
<Border Name="FloatingbarSelectionBG" Visibility="Hidden" Width="28" Height="34" <Border Name="FloatingbarSelectionBG" Visibility="Hidden" Width="28" Height="34"
@@ -6228,7 +6229,7 @@
</Canvas> </Canvas>
</Border> </Border>
</Canvas> </Canvas>
<ui:SimpleStackPanel Margin="2,0" Name="StackPanelFloatingBar" Orientation="Horizontal" Cursor="Arrow"> <ui:SimpleStackPanel Margin="2,0" Name="StackPanelFloatingBar" Orientation="Horizontal" Cursor="Arrow" HorizontalAlignment="Left">
<!--<ui:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"--> <!--<ui:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"-->
<ui:SimpleStackPanel Name="Cursor_Icon" <ui:SimpleStackPanel Name="Cursor_Icon"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
@@ -6284,7 +6285,8 @@
Width="60" Width="60"
Height="42" Height="42"
MaxWidth="60" MaxWidth="60"
MaxHeight="42"> MaxHeight="42"
MinWidth="60">
<!-- 第一行：黑、白、红、橙 --> <!-- 第一行：黑、白、红、橙 -->
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2"> <ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2">
<!-- 黑色 --> <!-- 黑色 -->
@@ -6602,17 +6604,20 @@
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="4,0,4,0" Margin="4,0,4,0"
Height="21" Height="24"
MaxHeight="21"> MaxHeight="24"
MinWidth="120">
<!-- 单行显示：黑、白、红、橙、黄、绿 --> <!-- 单行显示：黑、白、红、橙、黄、绿 -->
<!-- 黑色 --> <!-- 黑色 -->
<Border Name="QuickColorBlackSingle" <Border Name="QuickColorBlackSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
MaxWidth="20" MaxHeight="20"
Background="Black" Background="Black"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorBlack_Click" MouseUp="QuickColorBlack_Click"
@@ -6634,8 +6639,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="White" Fill="White"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -6645,12 +6650,14 @@
<!-- 白色 --> <!-- 白色 -->
<Border Name="QuickColorWhiteSingle" <Border Name="QuickColorWhiteSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
MaxWidth="20" MaxHeight="20"
Background="White" Background="White"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorWhite_Click" MouseUp="QuickColorWhite_Click"
@@ -6672,8 +6679,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="Black" Fill="Black"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -6683,12 +6690,14 @@
<!-- 红色 --> <!-- 红色 -->
<Border Name="QuickColorRedSingle" <Border Name="QuickColorRedSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
MaxWidth="20" MaxHeight="20"
Background="#FF0000" Background="#FF0000"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorRed_Click" MouseUp="QuickColorRed_Click"
@@ -6710,8 +6719,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="White" Fill="White"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -6721,12 +6730,14 @@
<!-- 橙色 --> <!-- 橙色 -->
<Border Name="QuickColorOrangeSingle" <Border Name="QuickColorOrangeSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
MaxWidth="20" MaxHeight="20"
Background="#FFA500" Background="#FFA500"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorOrange_Click" MouseUp="QuickColorOrange_Click"
@@ -6748,8 +6759,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="Black" Fill="Black"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -6759,12 +6770,14 @@
<!-- 黄色 --> <!-- 黄色 -->
<Border Name="QuickColorYellowSingle" <Border Name="QuickColorYellowSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
MaxWidth="20" MaxHeight="20"
Background="#FFFF00" Background="#FFFF00"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorYellow_Click" MouseUp="QuickColorYellow_Click"
@@ -6786,8 +6799,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="Black" Fill="Black"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -6797,12 +6810,14 @@
<!-- 绿色 --> <!-- 绿色 -->
<Border Name="QuickColorGreenSingle" <Border Name="QuickColorGreenSingle"
Width="13" Height="13" MinWidth="16" MinHeight="16"
Background="#008000" MaxWidth="20" MaxHeight="20"
Background="#16A34A"
BorderBrush="#CCCCCC" BorderBrush="#CCCCCC"
BorderThickness="1" BorderThickness="1"
CornerRadius="3" CornerRadius="3"
Margin="1,0,1,0" Margin="2,0,2,0"
VerticalAlignment="Center"
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
MouseUp="QuickColorGreen_Click" MouseUp="QuickColorGreen_Click"
@@ -6824,8 +6839,8 @@
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z" Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
Fill="Black" Fill="Black"
Stretch="Uniform" Stretch="Uniform"
Width="8" Width="10"
Height="8" Height="10"
Opacity="1.0" Opacity="1.0"
Visibility="Collapsed" Visibility="Collapsed"
HorizontalAlignment="Center" HorizontalAlignment="Center"