fix:修复浮动工具栏批注菜单位置错误

被恶心到了🤢

Ink Canvas/MainWindow.xaml

@@ -6542,70 +6542,6 @@
                                 <!--<ikw:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"-->
                                 <controls:ToolbarImageButton x:Name="Cursor_Icon" ButtonMouseUp="CursorIcon_Click" Label="{i18n:I18n Key=FloatingBar_Mouse}" />
                                 <controls:ToolbarImageButton x:Name="Pen_Icon" ButtonMouseUp="PenIcon_Click" Label="{i18n:I18n Key=FloatingBar_Annotate}" />
-                                
-                                <!-- 快捷调色盘 - 双行显示模式 -->
-                                <ikw:SimpleStackPanel Name="QuickColorPalettePanel" 
-                                                     Visibility="Collapsed"
-                                                     Orientation="Vertical" 
-                                                     HorizontalAlignment="Center" 
-                                                     Margin="4,0,4,0"
-                                                     Width="60"
-                                                     Height="42"
-                                                     MaxWidth="60"
-                                                     MaxHeight="42"
-                                                     MinWidth="60">
-                                    <!-- 第一行：黑、白、红、橙 -->
-                                    <ikw:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2">
-                                        <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">
-                                        <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>
-                                
-                                <!-- 快捷调色盘 - 单行显示模式 -->
-                                <ikw:SimpleStackPanel Name="QuickColorPaletteSingleRowPanel" 
-                                                     Visibility="Collapsed"
-                                                     Orientation="Horizontal" 
-                                                     HorizontalAlignment="Center" 
-                                                     Margin="4,0,4,0"
-                                                     Height="24"
-                                                     MaxHeight="24"
-                                                     MinWidth="120">
-                                    <!-- 单行显示：黑、白、红、橙、黄、绿 -->
-                                    <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}" />
-                                <ikw:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible"
-                                                     Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                                 <ikw:SimpleStackPanel Width="0"
                                                          Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                                     <Grid Margin="0,5,0,5" Width="0" RenderTransformOrigin="0.5,0.5">
@@ -6925,6 +6861,70 @@
                                         </Border>
                                     </Grid>
                                 </ikw:SimpleStackPanel>
+                                <!-- 快捷调色盘 - 双行显示模式 -->
+                                <ikw:SimpleStackPanel Name="QuickColorPalettePanel" 
+                                                     Visibility="Collapsed"
+                                                     Orientation="Vertical" 
+                                                     HorizontalAlignment="Center" 
+                                                     Margin="4,0,4,0"
+                                                     Width="60"
+                                                     Height="42"
+                                                     MaxWidth="60"
+                                                     MaxHeight="42"
+                                                     MinWidth="60">
+                                    <!-- 第一行：黑、白、红、橙 -->
+                                    <ikw:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,2">
+                                        <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">
+                                        <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>
+                                
+                                <!-- 快捷调色盘 - 单行显示模式 -->
+                                <ikw:SimpleStackPanel Name="QuickColorPaletteSingleRowPanel" 
+                                                     Visibility="Collapsed"
+                                                     Orientation="Horizontal" 
+                                                     HorizontalAlignment="Center" 
+                                                     Margin="4,0,4,0"
+                                                     Height="24"
+                                                     MaxHeight="24"
+                                                     MinWidth="120">
+                                    <!-- 单行显示：黑、白、红、橙、黄、绿 -->
+                                    <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}" />
+                                <ikw:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible"
+                                                     Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
+
 
                                     <controls:ToolbarImageButton x:Name="Eraser_Icon" ButtonMouseUp="EraserIcon_Click" Label="{i18n:I18n Key=FloatingBar_AreaEraser}" />
                                     <controls:ToolbarImageButton x:Name="EraserByStrokes_Icon" ButtonMouseUp="EraserIconByStrokes_Click" Label="{i18n:I18n Key=FloatingBar_StrokeEraser}" />