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 09:46:14 +08:00
parent 965d1c469e
commit 6201ccc7d1
1 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
SpineViewer/Views/MainWindow.xaml
View File

@@ -21,7 +21,7 @@
<Window.Resources> <Window.Resources>
<Style TargetType="{x:Type GridSplitter}"> <Style TargetType="{x:Type GridSplitter}">
<Setter Property="Background" Value="Gray"/> <Setter Property="Background" Value="{StaticResource SecondaryBorderBrush}"/>
<Setter Property="ShowsPreview" Value="False"/> <Setter Property="ShowsPreview" Value="False"/>
<Style.Triggers> <Style.Triggers>
<Trigger Property="ResizeDirection" Value="Columns"> <Trigger Property="ResizeDirection" Value="Columns">
@@ -467,14 +467,16 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid> <Border Padding="2">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto"/> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> <ColumnDefinition Width="*" />
<Label Grid.Column="0" Content="{Binding Name}" Background="#bfffffff"/> </Grid.ColumnDefinitions>
<ToggleButton Grid.Column="1" IsChecked="{Binding Status}"/> <Label Grid.Column="0" Content="{Binding Name}"/>
</Grid> <ToggleButton Grid.Column="1" IsChecked="{Binding Status}"/>
</Grid>
</Border>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
@@ -504,16 +506,18 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid> <Border Padding="2">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto" SharedSizeGroup="ColSlotName"/> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="Auto" SharedSizeGroup="ColSlotName"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> <ColumnDefinition Width="Auto"/>
<Label Grid.Column="0" Content="{Binding SlotName}" HorizontalAlignment="Left" Background="#bfffffff"/> </Grid.ColumnDefinitions>
<ComboBox Grid.Column="1" SelectedValue="{Binding AttachmentName}" ItemsSource="{Binding AttachmentNames}"/> <Label Grid.Column="0" Content="{Binding SlotName}" HorizontalAlignment="Left"/>
<ToggleButton Grid.Column="2" IsChecked="{Binding Visible}"/> <ComboBox Grid.Column="1" SelectedValue="{Binding AttachmentName}" ItemsSource="{Binding AttachmentNames}"/>
</Grid> <ToggleButton Grid.Column="2" IsChecked="{Binding Visible}"/>
</Grid>
</Border>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
@@ -545,41 +549,43 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid> <Border Padding="2">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto" SharedSizeGroup="ColTrackIdx"/> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="ColAniTime"/> <ColumnDefinition Width="Auto" SharedSizeGroup="ColTrackIdx"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="Auto" SharedSizeGroup="ColAniTime"/>
</Grid.ColumnDefinitions> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="{Binding TrackIndex}" HorizontalContentAlignment="Left" VerticalAlignment="Top" Background="#bfffffff"/> <Label Grid.Column="0" Content="{Binding TrackIndex}" HorizontalContentAlignment="Left" VerticalAlignment="Top"/>
<Label Grid.Column="1" Content="{Binding AnimationDuration}" VerticalAlignment="Top" ContentStringFormat="{}{0:F3} s"/> <Label Grid.Column="1" Content="{Binding AnimationDuration}" VerticalAlignment="Top" ContentStringFormat="{}{0:F3} s"/>
<Expander Grid.Column="2" HorizontalContentAlignment="Stretch"> <Expander Grid.Column="2" HorizontalContentAlignment="Stretch">
<Expander.Header> <Expander.Header>
<!-- hc 的模板自带左侧 10 的 padding, 此处用 -10 的 margin 来抵消去除 --> <!-- hc 的模板自带左侧 10 的 padding, 此处用 -10 的 margin 来抵消去除 -->
<ComboBox Margin="-10 0 0 0" Grid.Column="2" SelectedValue="{Binding AnimationName}" ItemsSource="{Binding AnimationNames}"/> <ComboBox Margin="-10 0 0 0" Grid.Column="2" SelectedValue="{Binding AnimationName}" ItemsSource="{Binding AnimationNames}"/>
</Expander.Header> </Expander.Header>
<Grid Margin="1 0 0 0"> <Grid Margin="1 0 0 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 时间因子 --> <!-- 时间因子 -->
<Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource Str_TrackTimeScale}" ToolTip="{DynamicResource Str_TrackTimeScaleTooltip}"/> <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource Str_TrackTimeScale}" ToolTip="{DynamicResource Str_TrackTimeScaleTooltip}"/>
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TrackTimeScale, StringFormat='{}{0:F3}'}" ToolTip="{DynamicResource Str_TrackTimeScaleTooltip}"/> <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TrackTimeScale, StringFormat='{}{0:F3}'}" ToolTip="{DynamicResource Str_TrackTimeScaleTooltip}"/>
<!-- Alpha 混合 --> <!-- Alpha 混合 -->
<Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource Str_TrackAlpha}" ToolTip="{DynamicResource Str_TrackAlphaTooltip}"/> <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource Str_TrackAlpha}" ToolTip="{DynamicResource Str_TrackAlphaTooltip}"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding TrackAlpha, StringFormat='{}{0:F3}'}" ToolTip="{DynamicResource Str_TrackAlphaTooltip}"/> <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding TrackAlpha, StringFormat='{}{0:F3}'}" ToolTip="{DynamicResource Str_TrackAlphaTooltip}"/>
</Grid> </Grid>
</Expander> </Expander>
</Grid> </Grid>
</Border>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
@@ -1004,7 +1010,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 预览画面容器 --> <!-- 预览画面容器 -->
<Border Grid.Row="0" x:Name="_renderPanelContainer"> <Border Grid.Row="0" x:Name="_renderPanelContainer" Background="{StaticResource SecondaryRegionBrush}">
<SFMLRenderer:SFMLRenderPanel x:Name="_renderPanel"/> <SFMLRenderer:SFMLRenderPanel x:Name="_renderPanel"/>
</Border> </Border>
@@ -1016,7 +1022,7 @@
DataContext="{Binding SFMLRendererViewModel}" DataContext="{Binding SFMLRendererViewModel}"
Grid.Row="1" Grid.Row="1"
Grid.IsSharedSizeScope="True" Grid.IsSharedSizeScope="True"
Background="{StaticResource DefaultBrush}"> Background="{StaticResource RegionBrush}">
<WrapPanel HorizontalAlignment="Center"> <WrapPanel HorizontalAlignment="Center">
<WrapPanel.Resources> <WrapPanel.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ButtonDefault}"> <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ButtonDefault}">