chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整颜色按钮背景色固定白色

Browse Source
This commit is contained in:
ww-rm
2025-10-03 16:17:26 +08:00
parent 07c0e84b7d
commit 20369aaf43
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
View File

@@ -114,14 +114,15 @@
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/> <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
</Popup> </Popup>
</Border> </Border>
<Button DockPanel.Dock="Right" <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
Content="..." <Button Content="..."
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}" Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
Click="ButtonPickColor_Click"> Click="ButtonPickColor_Click">
<Button.Background> <Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/> <SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background> </Button.Background>
</Button> </Button>
</Border>
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/> <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
</DockPanel> </DockPanel>
</Grid> </Grid>

17
SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
View File

@@ -114,14 +114,15 @@
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/> <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
</Popup> </Popup>
</Border> </Border>
<Button DockPanel.Dock="Right" <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
Content="..." <Button Content="..."
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}" Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
Click="ButtonPickColor_Click"> Click="ButtonPickColor_Click">
<Button.Background> <Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/> <SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background> </Button.Background>
</Button> </Button>
</Border>
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/> <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
</DockPanel> </DockPanel>
</Grid> </Grid>

17
SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
View File

@@ -114,14 +114,15 @@
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/> <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
</Popup> </Popup>
</Border> </Border>
<Button DockPanel.Dock="Right" <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
Content="..." <Button Content="..."
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}" Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
Click="ButtonPickColor_Click"> Click="ButtonPickColor_Click">
<Button.Background> <Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/> <SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background> </Button.Background>
</Button> </Button>
</Border>
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/> <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
</DockPanel> </DockPanel>
</Grid> </Grid>

17
SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
View File

@@ -114,14 +114,15 @@
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/> <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
</Popup> </Popup>
</Border> </Border>
<Button DockPanel.Dock="Right" <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
Content="..." <Button Content="..."
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}" Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
Click="ButtonPickColor_Click"> Click="ButtonPickColor_Click">
<Button.Background> <Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/> <SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background> </Button.Background>
</Button> </Button>
</Border>
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/> <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
</DockPanel> </DockPanel>
</Grid> </Grid>

4
SpineViewer/Views/MainWindow.xaml
View File

@@ -956,8 +956,8 @@
</Border> </Border>
<Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}"> <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
<Button Content="..." <Button Content="..."
Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}" Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
Click="ButtonPickColor_Click"> Click="ButtonPickColor_Click">
<Button.Background> <Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/> <SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background> </Button.Background>