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:11:04 +08:00
parent 6770acaffd
commit 07c0e84b7d
9 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SpineViewer/Views/AboutDialog.xaml
View File

@@ -8,6 +8,7 @@
d:DataContext="{d:DesignInstance Type=viewmodels:AboutDialogViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_Abount}"
Background="{StaticResource RegionBrush}"
Height="300"
Width="500"
ShowInTaskbar="False"

1
SpineViewer/Views/DiagnosticsDialog.xaml
View File

@@ -8,6 +8,7 @@
d:DataContext="{d:DesignInstance Type=viewmodels:DiagnosticsDialogViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_Diagnostics}"
Background="{StaticResource RegionBrush}"
Height="450"
Width="800"
ShowInTaskbar="False"

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

@@ -10,6 +10,7 @@
d:DataContext="{d:DesignInstance Type=exporters:CustomFFmpegExporterViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_CustomFFmpegExporterTitle}"
Background="{StaticResource RegionBrush}"
Width="450"
Height="800"
ShowInTaskbar="False"
@@ -47,7 +48,6 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
<Setter Property="Margin" Value="0 5 0 10"/>

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

@@ -10,6 +10,7 @@
d:DataContext="{d:DesignInstance Type=vmexp:FFmpegVideoExporterViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_FFmpegVideoExporterTitle}"
Background="{StaticResource RegionBrush}"
Width="450"
Height="750"
ShowInTaskbar="False"
@@ -47,7 +48,6 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
<Setter Property="Margin" Value="0 5 0 10"/>

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

@@ -10,6 +10,7 @@
d:DataContext="{d:DesignInstance Type=vmexp:FrameExporterViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_FrameExporterTitle}"
Background="{StaticResource RegionBrush}"
Width="450"
Height="480"
ShowInTaskbar="False"
@@ -47,7 +48,6 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
<Setter Property="Margin" Value="0 5 0 10"/>

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

@@ -9,7 +9,8 @@
xmlns:vmexp="clr-namespace:SpineViewer.ViewModels.Exporters"
d:DataContext="{d:DesignInstance Type=vmexp:FrameSequenceExporterViewModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_FrameSequenceExporterTitle}"
Title="{DynamicResource Str_FrameSequenceExporterTitle}"
Background="{StaticResource RegionBrush}"
Width="450"
Height="550"
ShowInTaskbar="False"
@@ -47,7 +48,6 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
<Setter Property="Margin" Value="0 5 0 10"/>

13
SpineViewer/Views/MainWindow.xaml
View File

@@ -954,14 +954,15 @@
<hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
</Popup>
</Border>
<Button DockPanel.Dock="Right"
Content="..."
<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>
<Button.Background>
<SolidColorBrush Color="{Binding BackgroundColor}"/>
</Button.Background>
</Button>
</Border>
<TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
</DockPanel>
</Grid>

2
SpineViewer/Views/PreferenceDialog.xaml
View File

@@ -10,6 +10,7 @@
d:DataContext="{d:DesignInstance Type=models:PreferenceModel}"
mc:Ignorable="d"
Title="{DynamicResource Str_Preference}"
Background="{StaticResource RegionBrush}"
Height="650"
Width="600"
ShowInTaskbar="False"
@@ -44,7 +45,6 @@
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
<Setter Property="BorderBrush" Value="LightGray"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="hc:TitleElement.Background" Value="Transparent"/>
<Setter Property="Margin" Value="0 5 0 10"/>

1
SpineViewer/Views/ProgressDialog.xaml
View File

@@ -9,6 +9,7 @@
d:DataContext="{d:DesignInstance Type=vm:ProgressDialogViewModel}"
mc:Ignorable="d"
Title="{Binding Title}"
Background="{StaticResource RegionBrush}"
Width="550"
Height="250"
ResizeMode="NoResize"