From 20369aaf4339fc970443b2c883c61a903d467c64 Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Fri, 3 Oct 2025 16:17:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=9C=E8=89=B2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=83=8C=E6=99=AF=E8=89=B2=E5=9B=BA=E5=AE=9A=E7=99=BD?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFFmpegExporterDialog.xaml             | 17 +++++++++--------
 .../FFmpegVideoExporterDialog.xaml              | 17 +++++++++--------
 .../ExporterDialogs/FrameExporterDialog.xaml    | 17 +++++++++--------
 .../FrameSequenceExporterDialog.xaml            | 17 +++++++++--------
 SpineViewer/Views/MainWindow.xaml               |  4 ++--
 5 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
index 6843ebe..12fd91e 100644
--- a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index f6f3c75..5628be4 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index 9feab6c..12ca688 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
index 3097f38..2bfedd0 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 65af3c1..1936bb0 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -956,8 +956,8 @@
                                             </Border>
                                             <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
                                                 <Button Content="..."
-                                                    Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                                    Click="ButtonPickColor_Click">
+                                                        Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                        Click="ButtonPickColor_Click">
                                                     <Button.Background>
                                                         <SolidColorBrush Color="{Binding BackgroundColor}"/>
                                                     </Button.Background>