优化
This commit is contained in:
PrefacedCorg
+28
-541
@@ -7199,312 +7199,26 @@
|
||||
MinWidth="60">
|
||||
<!-- 第一行：黑、白、红、橙 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2">
|
||||
<!-- 黑色 -->
|
||||
<Border Name="QuickColorBlack"
|
||||
Width="13" Height="13"
|
||||
Background="Black"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorBlack_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Black}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorBlackCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 白色 -->
|
||||
<Border Name="QuickColorWhite"
|
||||
Width="13" Height="13"
|
||||
Background="White"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorWhite_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_White}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorWhiteCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 红色 -->
|
||||
<Border Name="QuickColorRed"
|
||||
Width="13" Height="13"
|
||||
Background="#FF0000"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorRed_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Red}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorRedCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 橙色 -->
|
||||
<Border Name="QuickColorOrange"
|
||||
Width="13" Height="13"
|
||||
Background="#FFA500"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorOrange_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Orange}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorOrangeCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<controls:ColorPickerButton x:Name="QuickColorBlack" Color="Black" CheckIconFill="White" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorBlack_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Black}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorWhite" Color="White" CheckIconFill="Black" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorWhite_Click" ToolTip="{i18n:I18n Key=Canvas_Color_White}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorRed" Color="#FF0000" CheckIconFill="White" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorRed_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Red}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorOrange" Color="#FFA500" CheckIconFill="Black" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorOrange_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Orange}"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第二行：黄、绿、蓝、紫 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" Margin="0,2,0,0">
|
||||
<!-- 黄色 -->
|
||||
<Border Name="QuickColorYellow"
|
||||
Width="13" Height="13"
|
||||
Background="#FFFF00"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorYellow_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Yellow}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorYellowCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 绿色 -->
|
||||
<Border Name="QuickColorGreen"
|
||||
Width="13" Height="13"
|
||||
Background="#16A34A"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorGreen_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Green}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorGreenCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 蓝色 -->
|
||||
<Border Name="QuickColorBlue"
|
||||
Width="13" Height="13"
|
||||
Background="#2563EB"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorBlue_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Blue}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorBlueCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 紫色 -->
|
||||
<Border Name="QuickColorPurple"
|
||||
Width="13" Height="13"
|
||||
Background="#9333EA"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorPurple_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Purple}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorPurpleCheck"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="8"
|
||||
Height="8"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<controls:ColorPickerButton x:Name="QuickColorYellow" Color="#FFFF00" CheckIconFill="Black" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorYellow_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Yellow}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorGreen" Color="#16A34A" CheckIconFill="Black" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorGreen_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Green}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorBlue" Color="#2563EB" CheckIconFill="White" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorBlue_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Blue}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorPurple" Color="#9333EA" CheckIconFill="White" ButtonSize="13" CheckIconSize="8"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorPurple_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Purple}"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
@@ -7518,245 +7232,18 @@
|
||||
MaxHeight="24"
|
||||
MinWidth="120">
|
||||
<!-- 单行显示：黑、白、红、橙、黄、绿 -->
|
||||
<!-- 黑色 -->
|
||||
<Border Name="QuickColorBlackSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="Black"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorBlack_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Black}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorBlackCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 白色 -->
|
||||
<Border Name="QuickColorWhiteSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="White"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorWhite_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_White}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorWhiteCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 红色 -->
|
||||
<Border Name="QuickColorRedSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="#FF0000"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorRed_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Red}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorRedCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="White"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 橙色 -->
|
||||
<Border Name="QuickColorOrangeSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="#FFA500"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorOrange_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Orange}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorOrangeCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 黄色 -->
|
||||
<Border Name="QuickColorYellowSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="#FFFF00"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorYellow_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Yellow}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorYellowCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 绿色 -->
|
||||
<Border Name="QuickColorGreenSingle"
|
||||
MinWidth="16" MinHeight="16"
|
||||
MaxWidth="20" MaxHeight="20"
|
||||
Background="#16A34A"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="2,0,2,0"
|
||||
VerticalAlignment="Center"
|
||||
MouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
|
||||
MouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
|
||||
MouseUp="QuickColorGreen_Click"
|
||||
ToolTip="{i18n:I18n Key=Canvas_Color_Green}">
|
||||
<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>
|
||||
<!-- Check图标容器 -->
|
||||
<Grid>
|
||||
<!-- Check图标 -->
|
||||
<Path Name="QuickColorGreenCheckSingle"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Fill="Black"
|
||||
Stretch="Uniform"
|
||||
Width="10"
|
||||
Height="10"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<controls:ColorPickerButton x:Name="QuickColorBlackSingle" Color="Black" CheckIconFill="White" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorBlack_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Black}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorWhiteSingle" Color="White" CheckIconFill="Black" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorWhite_Click" ToolTip="{i18n:I18n Key=Canvas_Color_White}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorRedSingle" Color="#FF0000" CheckIconFill="White" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorRed_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Red}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorOrangeSingle" Color="#FFA500" CheckIconFill="Black" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorOrange_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Orange}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorYellowSingle" Color="#FFFF00" CheckIconFill="Black" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorYellow_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Yellow}"/>
|
||||
<controls:ColorPickerButton x:Name="QuickColorGreenSingle" Color="#16A34A" CheckIconFill="Black" ButtonSize="18" CheckIconSize="10"
|
||||
ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel" ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel" ButtonMouseUp="QuickColorGreen_Click" ToolTip="{i18n:I18n Key=Canvas_Color_Green}"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<controls:ToolbarImageButton x:Name="SymbolIconDelete" ButtonMouseUp="SymbolIconDelete_MouseUp" IconBrush="{DynamicResource RedBrush}" Label="{i18n:I18n Key=FloatingBar_Clear}" />
|
||||
|
||||
@@ -1023,6 +1023,10 @@ namespace Ink_Canvas
|
||||
border.Background = new SolidColorBrush(Color.FromArgb(28, 24, 24, 27));
|
||||
}
|
||||
}
|
||||
else if (sender is Ink_Canvas.Controls.ColorPickerButton colorPicker)
|
||||
{
|
||||
lastBorderMouseDownObject = sender;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1083,6 +1087,10 @@ namespace Ink_Canvas
|
||||
border.Background = new SolidColorBrush(Colors.Transparent);
|
||||
}
|
||||
}
|
||||
else if (sender is Ink_Canvas.Controls.ColorPickerButton colorPicker)
|
||||
{
|
||||
lastBorderMouseDownObject = null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -2820,22 +2828,22 @@ namespace Ink_Canvas
|
||||
private void UpdateQuickColorPaletteIndicator(Color selectedColor)
|
||||
{
|
||||
// 隐藏所有check图标（双行显示）
|
||||
QuickColorWhiteCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorOrangeCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorYellowCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorBlackCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorBlueCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorRedCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorGreenCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorPurpleCheck.Visibility = Visibility.Collapsed;
|
||||
QuickColorWhite.IsChecked = false;
|
||||
QuickColorOrange.IsChecked = false;
|
||||
QuickColorYellow.IsChecked = false;
|
||||
QuickColorBlack.IsChecked = false;
|
||||
QuickColorBlue.IsChecked = false;
|
||||
QuickColorRed.IsChecked = false;
|
||||
QuickColorGreen.IsChecked = false;
|
||||
QuickColorPurple.IsChecked = false;
|
||||
|
||||
// 隐藏所有check图标（单行显示）
|
||||
QuickColorWhiteCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorOrangeCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorYellowCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorBlackCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorRedCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorGreenCheckSingle.Visibility = Visibility.Collapsed;
|
||||
QuickColorWhiteSingle.IsChecked = false;
|
||||
QuickColorOrangeSingle.IsChecked = false;
|
||||
QuickColorYellowSingle.IsChecked = false;
|
||||
QuickColorBlackSingle.IsChecked = false;
|
||||
QuickColorRedSingle.IsChecked = false;
|
||||
QuickColorGreenSingle.IsChecked = false;
|
||||
|
||||
// 显示当前选中颜色的check图标
|
||||
// 在荧光笔模式下，使用更宽松的颜色匹配
|
||||
@@ -2843,21 +2851,21 @@ namespace Ink_Canvas
|
||||
|
||||
if (IsColorSimilar(selectedColor, Colors.White, tolerance) || IsColorSimilar(selectedColor, Color.FromRgb(250, 250, 250), tolerance))
|
||||
{
|
||||
QuickColorWhiteCheck.Visibility = Visibility.Visible;
|
||||
QuickColorWhiteCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorWhite.IsChecked = true;
|
||||
QuickColorWhiteSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Colors.Black, tolerance))
|
||||
{
|
||||
QuickColorBlackCheck.Visibility = Visibility.Visible;
|
||||
QuickColorBlackCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorBlack.IsChecked = true;
|
||||
QuickColorBlackSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Colors.Yellow, tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(234, 179, 8), tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(250, 204, 21), tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(253, 224, 71), tolerance))
|
||||
{
|
||||
QuickColorYellowCheck.Visibility = Visibility.Visible;
|
||||
QuickColorYellowCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorYellow.IsChecked = true;
|
||||
QuickColorYellowSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Color.FromRgb(255, 165, 0), tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(251, 150, 80), tolerance) ||
|
||||
@@ -2866,29 +2874,29 @@ namespace Ink_Canvas
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(251, 146, 60), tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(253, 126, 20), tolerance))
|
||||
{
|
||||
QuickColorOrangeCheck.Visibility = Visibility.Visible;
|
||||
QuickColorOrangeCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorOrange.IsChecked = true;
|
||||
QuickColorOrangeSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Color.FromRgb(37, 99, 235), tolerance))
|
||||
{
|
||||
QuickColorBlueCheck.Visibility = Visibility.Visible;
|
||||
QuickColorBlue.IsChecked = true;
|
||||
// 单行显示模式没有蓝色，所以不设置单行的check
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Colors.Red, tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(220, 38, 38), tolerance) ||
|
||||
IsColorSimilar(selectedColor, Color.FromRgb(239, 68, 68), tolerance))
|
||||
{
|
||||
QuickColorRedCheck.Visibility = Visibility.Visible;
|
||||
QuickColorRedCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorRed.IsChecked = true;
|
||||
QuickColorRedSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Color.FromRgb(22, 163, 74), tolerance))
|
||||
{
|
||||
QuickColorGreenCheck.Visibility = Visibility.Visible;
|
||||
QuickColorGreenCheckSingle.Visibility = Visibility.Visible;
|
||||
QuickColorGreen.IsChecked = true;
|
||||
QuickColorGreenSingle.IsChecked = true;
|
||||
}
|
||||
else if (IsColorSimilar(selectedColor, Color.FromRgb(147, 51, 234), tolerance))
|
||||
{
|
||||
QuickColorPurpleCheck.Visibility = Visibility.Visible;
|
||||
QuickColorPurple.IsChecked = true;
|
||||
// 单行显示模式没有紫色，所以不设置单行的check
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user