优化
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
<UserControl x:Class="Ink_Canvas.Controls.CircularColorButton"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="45" d:DesignWidth="45">
|
||||
<Border x:Name="ButtonBorder"
|
||||
BorderBrush="#fed7aa"
|
||||
BorderThickness="1.5"
|
||||
CornerRadius="100"
|
||||
MouseDown="ButtonBorder_MouseDown"
|
||||
MouseLeave="ButtonBorder_MouseLeave"
|
||||
MouseUp="ButtonBorder_MouseUp">
|
||||
<Canvas x:Name="ButtonCanvas">
|
||||
<Image x:Name="TransparentGridImage"
|
||||
Source="/Resources/Icons-png/transparent-grid.png"
|
||||
RenderOptions.BitmapScalingMode="HighQuality">
|
||||
<Image.Clip>
|
||||
<EllipseGeometry x:Name="ImageClipGeometry" Center="21,21" RadiusX="21" RadiusY="21"/>
|
||||
</Image.Clip>
|
||||
</Image>
|
||||
<Border x:Name="ColorOverlay"
|
||||
CornerRadius="21"
|
||||
Opacity="0.75"/>
|
||||
<Viewbox x:Name="CheckViewbox"
|
||||
Visibility="Visible"
|
||||
Canvas.Top="9"
|
||||
Canvas.Left="9"
|
||||
Width="24"
|
||||
Height="24">
|
||||
<Image x:Name="CheckImage"
|
||||
Source="/Resources/new-icons/checked-white.png"
|
||||
RenderOptions.BitmapScalingMode="HighQuality"
|
||||
VerticalAlignment="Top"/>
|
||||
</Viewbox>
|
||||
</Canvas>
|
||||
</Border>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,194 @@
|
||||
using System;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace Ink_Canvas.Controls
|
||||
{
|
||||
public partial class CircularColorButton : UserControl
|
||||
{
|
||||
public static readonly DependencyProperty ColorProperty = DependencyProperty.Register(
|
||||
nameof(Color), typeof(Color), typeof(CircularColorButton),
|
||||
new PropertyMetadata(Colors.Transparent, OnColorChanged));
|
||||
|
||||
private static void OnColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.ColorOverlay != null)
|
||||
button.ColorOverlay.Background = new SolidColorBrush((Color)e.NewValue);
|
||||
}
|
||||
|
||||
public Color Color
|
||||
{
|
||||
get => (Color)GetValue(ColorProperty);
|
||||
set => SetValue(ColorProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty ColorOpacityProperty = DependencyProperty.Register(
|
||||
nameof(ColorOpacity), typeof(double), typeof(CircularColorButton),
|
||||
new PropertyMetadata(0.75, OnColorOpacityChanged));
|
||||
|
||||
private static void OnColorOpacityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.ColorOverlay != null)
|
||||
button.ColorOverlay.Opacity = (double)e.NewValue;
|
||||
}
|
||||
|
||||
public double ColorOpacity
|
||||
{
|
||||
get => (double)GetValue(ColorOpacityProperty);
|
||||
set => SetValue(ColorOpacityProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
|
||||
nameof(IsChecked), typeof(bool), typeof(CircularColorButton),
|
||||
new PropertyMetadata(true, OnIsCheckedChanged));
|
||||
|
||||
private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.CheckViewbox != null)
|
||||
button.CheckViewbox.Visibility = (bool)e.NewValue ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
|
||||
public bool IsChecked
|
||||
{
|
||||
get => (bool)GetValue(IsCheckedProperty);
|
||||
set => SetValue(IsCheckedProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty ButtonSizeProperty = DependencyProperty.Register(
|
||||
nameof(ButtonSize), typeof(double), typeof(CircularColorButton),
|
||||
new PropertyMetadata(45.0, OnButtonSizeChanged));
|
||||
|
||||
private static void OnButtonSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.ButtonBorder == null) return;
|
||||
|
||||
var size = (double)e.NewValue;
|
||||
button.ButtonBorder.Width = size;
|
||||
button.ButtonBorder.Height = size;
|
||||
var radius = (size - 3) / 2;
|
||||
button.ColorOverlay.Width = radius * 2;
|
||||
button.ColorOverlay.Height = radius * 2;
|
||||
button.ImageClipGeometry.RadiusX = radius;
|
||||
button.ImageClipGeometry.RadiusY = radius;
|
||||
button.ImageClipGeometry.Center = new Point(radius, radius);
|
||||
button.TransparentGridImage.Width = radius * 2;
|
||||
button.TransparentGridImage.Height = radius * 2;
|
||||
}
|
||||
|
||||
public double ButtonSize
|
||||
{
|
||||
get => (double)GetValue(ButtonSizeProperty);
|
||||
set => SetValue(ButtonSizeProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty BorderBrushColorProperty = DependencyProperty.Register(
|
||||
nameof(BorderBrushColor), typeof(Color), typeof(CircularColorButton),
|
||||
new PropertyMetadata(Color.FromRgb(254, 215, 170), OnBorderBrushColorChanged));
|
||||
|
||||
private static void OnBorderBrushColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.ButtonBorder != null)
|
||||
button.ButtonBorder.BorderBrush = new SolidColorBrush((Color)e.NewValue);
|
||||
}
|
||||
|
||||
public Color BorderBrushColor
|
||||
{
|
||||
get => (Color)GetValue(BorderBrushColorProperty);
|
||||
set => SetValue(BorderBrushColorProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty CheckIconSourceProperty = DependencyProperty.Register(
|
||||
nameof(CheckIconSource), typeof(string), typeof(CircularColorButton),
|
||||
new PropertyMetadata("/Resources/new-icons/checked-white.png", OnCheckIconSourceChanged));
|
||||
|
||||
private static void OnCheckIconSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (CircularColorButton)d;
|
||||
if (button.CheckImage != null)
|
||||
button.CheckImage.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri((string)e.NewValue, UriKind.Relative));
|
||||
}
|
||||
|
||||
public string CheckIconSource
|
||||
{
|
||||
get => (string)GetValue(CheckIconSourceProperty);
|
||||
set => SetValue(CheckIconSourceProperty, value);
|
||||
}
|
||||
|
||||
public event MouseButtonEventHandler ButtonMouseDown;
|
||||
public event MouseEventHandler ButtonMouseLeave;
|
||||
public event RoutedEventHandler ButtonMouseUp;
|
||||
|
||||
public CircularColorButton()
|
||||
{
|
||||
InitializeComponent();
|
||||
Loaded += CircularColorButton_Loaded;
|
||||
}
|
||||
|
||||
private void CircularColorButton_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
ApplyAllProperties();
|
||||
}
|
||||
|
||||
private void ApplyAllProperties()
|
||||
{
|
||||
if (ButtonBorder != null)
|
||||
{
|
||||
ButtonBorder.BorderBrush = new SolidColorBrush(BorderBrushColor);
|
||||
var size = ButtonSize;
|
||||
ButtonBorder.Width = size;
|
||||
ButtonBorder.Height = size;
|
||||
}
|
||||
if (ColorOverlay != null)
|
||||
{
|
||||
ColorOverlay.Background = new SolidColorBrush(Color);
|
||||
ColorOverlay.Opacity = ColorOpacity;
|
||||
var radius = (ButtonSize - 3) / 2;
|
||||
ColorOverlay.Width = radius * 2;
|
||||
ColorOverlay.Height = radius * 2;
|
||||
}
|
||||
if (ImageClipGeometry != null)
|
||||
{
|
||||
var radius = (ButtonSize - 3) / 2;
|
||||
ImageClipGeometry.RadiusX = radius;
|
||||
ImageClipGeometry.RadiusY = radius;
|
||||
ImageClipGeometry.Center = new Point(radius, radius);
|
||||
}
|
||||
if (TransparentGridImage != null)
|
||||
{
|
||||
var radius = (ButtonSize - 3) / 2;
|
||||
TransparentGridImage.Width = radius * 2;
|
||||
TransparentGridImage.Height = radius * 2;
|
||||
}
|
||||
if (CheckViewbox != null)
|
||||
{
|
||||
CheckViewbox.Visibility = IsChecked ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
if (CheckImage != null)
|
||||
{
|
||||
CheckImage.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(CheckIconSource, UriKind.Relative));
|
||||
}
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
ButtonMouseDown?.Invoke(this, e);
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseLeave(object sender, MouseEventArgs e)
|
||||
{
|
||||
ButtonMouseLeave?.Invoke(this, e);
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
ButtonMouseUp?.Invoke(this, new RoutedEventArgs(e.RoutedEvent, this));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
<UserControl x:Class="Ink_Canvas.Controls.ColorPickerButton"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="13" d:DesignWidth="13">
|
||||
<Border x:Name="ButtonBorder"
|
||||
BorderBrush="#CCCCCC"
|
||||
BorderThickness="1"
|
||||
CornerRadius="3"
|
||||
Margin="1,0,1,0"
|
||||
MouseDown="ButtonBorder_MouseDown"
|
||||
MouseLeave="ButtonBorder_MouseLeave"
|
||||
MouseUp="ButtonBorder_MouseUp">
|
||||
<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>
|
||||
<Path x:Name="CheckPath"
|
||||
Data="M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z"
|
||||
Stretch="Uniform"
|
||||
Opacity="1.0"
|
||||
Visibility="Collapsed"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,149 @@
|
||||
using System;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace Ink_Canvas.Controls
|
||||
{
|
||||
public partial class ColorPickerButton : UserControl
|
||||
{
|
||||
public static readonly DependencyProperty ColorProperty = DependencyProperty.Register(
|
||||
nameof(Color), typeof(Color), typeof(ColorPickerButton),
|
||||
new PropertyMetadata(Colors.Black, OnColorChanged));
|
||||
|
||||
private static void OnColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (ColorPickerButton)d;
|
||||
if (button.ButtonBorder != null)
|
||||
button.ButtonBorder.Background = new SolidColorBrush((Color)e.NewValue);
|
||||
}
|
||||
|
||||
public Color Color
|
||||
{
|
||||
get => (Color)GetValue(ColorProperty);
|
||||
set => SetValue(ColorProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
|
||||
nameof(IsChecked), typeof(bool), typeof(ColorPickerButton),
|
||||
new PropertyMetadata(false, OnIsCheckedChanged));
|
||||
|
||||
private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (ColorPickerButton)d;
|
||||
if (button.CheckPath != null)
|
||||
button.CheckPath.Visibility = (bool)e.NewValue ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
|
||||
public bool IsChecked
|
||||
{
|
||||
get => (bool)GetValue(IsCheckedProperty);
|
||||
set => SetValue(IsCheckedProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty CheckIconFillProperty = DependencyProperty.Register(
|
||||
nameof(CheckIconFill), typeof(Brush), typeof(ColorPickerButton),
|
||||
new PropertyMetadata(Brushes.White, OnCheckIconFillChanged));
|
||||
|
||||
private static void OnCheckIconFillChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (ColorPickerButton)d;
|
||||
if (button.CheckPath != null)
|
||||
button.CheckPath.Fill = (Brush)e.NewValue;
|
||||
}
|
||||
|
||||
public Brush CheckIconFill
|
||||
{
|
||||
get => (Brush)GetValue(CheckIconFillProperty);
|
||||
set => SetValue(CheckIconFillProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty ButtonSizeProperty = DependencyProperty.Register(
|
||||
nameof(ButtonSize), typeof(double), typeof(ColorPickerButton),
|
||||
new PropertyMetadata(13.0, OnButtonSizeChanged));
|
||||
|
||||
private static void OnButtonSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (ColorPickerButton)d;
|
||||
if (button.ButtonBorder != null)
|
||||
{
|
||||
button.ButtonBorder.Width = (double)e.NewValue;
|
||||
button.ButtonBorder.Height = (double)e.NewValue;
|
||||
}
|
||||
}
|
||||
|
||||
public double ButtonSize
|
||||
{
|
||||
get => (double)GetValue(ButtonSizeProperty);
|
||||
set => SetValue(ButtonSizeProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty CheckIconSizeProperty = DependencyProperty.Register(
|
||||
nameof(CheckIconSize), typeof(double), typeof(ColorPickerButton),
|
||||
new PropertyMetadata(8.0, OnCheckIconSizeChanged));
|
||||
|
||||
private static void OnCheckIconSizeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var button = (ColorPickerButton)d;
|
||||
if (button.CheckPath != null)
|
||||
{
|
||||
button.CheckPath.Width = (double)e.NewValue;
|
||||
button.CheckPath.Height = (double)e.NewValue;
|
||||
}
|
||||
}
|
||||
|
||||
public double CheckIconSize
|
||||
{
|
||||
get => (double)GetValue(CheckIconSizeProperty);
|
||||
set => SetValue(CheckIconSizeProperty, value);
|
||||
}
|
||||
|
||||
public event MouseButtonEventHandler ButtonMouseDown;
|
||||
public event MouseEventHandler ButtonMouseLeave;
|
||||
public event RoutedEventHandler ButtonMouseUp;
|
||||
|
||||
public ColorPickerButton()
|
||||
{
|
||||
InitializeComponent();
|
||||
Loaded += ColorPickerButton_Loaded;
|
||||
}
|
||||
|
||||
private void ColorPickerButton_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
ApplyAllProperties();
|
||||
}
|
||||
|
||||
private void ApplyAllProperties()
|
||||
{
|
||||
if (ButtonBorder != null)
|
||||
{
|
||||
ButtonBorder.Background = new SolidColorBrush(Color);
|
||||
ButtonBorder.Width = ButtonSize;
|
||||
ButtonBorder.Height = ButtonSize;
|
||||
}
|
||||
if (CheckPath != null)
|
||||
{
|
||||
CheckPath.Fill = CheckIconFill;
|
||||
CheckPath.Width = CheckIconSize;
|
||||
CheckPath.Height = CheckIconSize;
|
||||
CheckPath.Visibility = IsChecked ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
ButtonMouseDown?.Invoke(this, e);
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseLeave(object sender, MouseEventArgs e)
|
||||
{
|
||||
ButtonMouseLeave?.Invoke(this, e);
|
||||
}
|
||||
|
||||
private void ButtonBorder_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
ButtonMouseUp?.Invoke(this, new RoutedEventArgs(e.RoutedEvent, this));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user