|
@@ -27,8 +27,8 @@
|
|
<Border Grid.Row="0" Grid.Column="0" BorderThickness="0 0 1 0"
|
|
<Border Grid.Row="0" Grid.Column="0" BorderThickness="0 0 1 0"
|
|
BorderBrush="{DynamicResource ThemeBorderMidBrush}">
|
|
BorderBrush="{DynamicResource ThemeBorderMidBrush}">
|
|
<input:SizeInput Unit="FPS"
|
|
<input:SizeInput Unit="FPS"
|
|
- Width="80" Height="25" HorizontalAlignment="Left"
|
|
|
|
- Size="{Binding Fps, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
|
|
|
|
|
|
+ Width="80" Height="25" HorizontalAlignment="Left"
|
|
|
|
+ Size="{Binding Fps, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
|
|
</Border>
|
|
</Border>
|
|
<Border Grid.Row="0" Grid.Column="1">
|
|
<Border Grid.Row="0" Grid.Column="1">
|
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="5">
|
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="5">
|
|
@@ -41,12 +41,13 @@
|
|
<MultiBinding.Converter>
|
|
<MultiBinding.Converter>
|
|
<converters:FrameToTimeConverter />
|
|
<converters:FrameToTimeConverter />
|
|
</MultiBinding.Converter>
|
|
</MultiBinding.Converter>
|
|
- <Binding Path="ActiveFrame" RelativeSource="{RelativeSource TemplatedParent}" />
|
|
|
|
|
|
+ <Binding Path="ActiveFrame"
|
|
|
|
+ RelativeSource="{RelativeSource TemplatedParent}" />
|
|
<Binding Path="Fps" RelativeSource="{RelativeSource TemplatedParent}" />
|
|
<Binding Path="Fps" RelativeSource="{RelativeSource TemplatedParent}" />
|
|
</MultiBinding>
|
|
</MultiBinding>
|
|
</Run.Text>
|
|
</Run.Text>
|
|
</Run>
|
|
</Run>
|
|
- <Run Text="/"/>
|
|
|
|
|
|
+ <Run Text="/" />
|
|
<Run>
|
|
<Run>
|
|
<Run.Text>
|
|
<Run.Text>
|
|
<MultiBinding>
|
|
<MultiBinding>
|
|
@@ -149,7 +150,7 @@
|
|
Grid.Row="1" Grid.Column="0">
|
|
Grid.Row="1" Grid.Column="0">
|
|
<StackPanel Orientation="Vertical" Background="{DynamicResource ThemeBackgroundBrush1}">
|
|
<StackPanel Orientation="Vertical" Background="{DynamicResource ThemeBackgroundBrush1}">
|
|
<ItemsControl
|
|
<ItemsControl
|
|
- ItemsSource="{Binding KeyFrames, RelativeSource={RelativeSource TemplatedParent}}">
|
|
|
|
|
|
+ ItemsSource="{Binding KeyFrames, RelativeSource={RelativeSource TemplatedParent}}">
|
|
<ItemsControl.DataTemplates>
|
|
<ItemsControl.DataTemplates>
|
|
<DataTemplate DataType="document:KeyFrameGroupViewModel">
|
|
<DataTemplate DataType="document:KeyFrameGroupViewModel">
|
|
<animations:TimelineGroupHeader Height="70"
|
|
<animations:TimelineGroupHeader Height="70"
|