Mercurial Mercurial > fingersdance / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Design Timeline Control
authorsarias
Thu, 24 Sep 2009 15:06:42 +0200
changeset 102 e1f7c03c2dde
parent 101 33d221312ea1
child 103 6eb5b39f8e97
Design Timeline Control
src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml file | annotate | diff | comparison | revisions
src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml	Thu Sep 24 14:48:21 2009 +0200
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml	Thu Sep 24 15:06:42 2009 +0200
@@ -11,7 +11,7 @@
 
     <Grid x:Name="LayoutRoot" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}">
         <Grid VerticalAlignment="Top" Height="100" x:Name="GridTimeLine">
-        	<FingersDance_Control_TimeLine:UserControlTimeLine Margin="40,0,8,0" x:Name="UCTimeLine" DragStarted="UserControlTimeLine_DragStarted" DragCompleted="UserControlTimeLine_DragCompleted" TimerTick="UserControlTimeLine_TimerTick" d:LayoutOverrides="Height" Background="{x:Null}" />
+        	<FingersDance_Control_TimeLine:UserControlTimeLine Margin="40,0,108,0" x:Name="UCTimeLine" DragStarted="UserControlTimeLine_DragStarted" DragCompleted="UserControlTimeLine_DragCompleted" TimerTick="UserControlTimeLine_TimerTick" d:LayoutOverrides="Height" Background="{x:Null}" />
         </Grid>
         <Grid HorizontalAlignment="Stretch" Width="Auto" Height="Auto" VerticalAlignment="Stretch" x:Name="GridPlayer" Margin="0,54,0,0">
         	<FingersDance_Control_Player:UserControlPlayer PlayerOpened="UserControlPlayer_PlayerOpened" x:Name="UserControlPlayer" VerticalAlignment="Stretch" d:LayoutOverrides="GridBox" Width="{Binding Path=ActualWidth, ElementName=GridPlayer, Mode=Default}" Margin="0,0,0,0" Height="{Binding Path=ActualHeight, ElementName=GridPlayer, Mode=Default}" />
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Thu Sep 24 14:48:21 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Thu Sep 24 15:06:42 2009 +0200
@@ -67,8 +67,17 @@
 							<TickBar x:Name="TopTick" Margin="0,0,0,1" Height="4" Opacity="1" SnapsToDevicePixels="True" Visibility="Collapsed" Grid.Row="0" Fill="{TemplateBinding BorderBrush}" IsDirectionReversed="False" Placement="Top" ReservedSpace="30"/>
 							<TickBar x:Name="BottomTick" Margin="0,1,0,0" Height="4" Opacity="1" SnapsToDevicePixels="True" Visibility="Collapsed" Grid.Row="2" Fill="{TemplateBinding BorderBrush}" Placement="Bottom" ReservedSpace="30"/>
 							<Rectangle x:Name="TrackBkgd" RadiusX="3" RadiusY="3" HorizontalAlignment="Stretch" VerticalAlignment="Center" Width="Auto" Height="3" Opacity="1" SnapsToDevicePixels="True" Grid.Row="1" Fill="#FFF8EDED" Stroke="{x:Null}"/>
-							<Ellipse Fill="White" Stroke="{x:Null}" HorizontalAlignment="Left" Margin="315.906,10.116,0,10.128" Width="12.078" Grid.Row="1"/>
-							<Ellipse Fill="White" Stroke="{x:Null}" HorizontalAlignment="Left" Margin="0,10.116,0,10.128" Width="12.078" Grid.Row="1"/>
+							<Ellipse Fill="White" Stroke="{x:Null}" HorizontalAlignment="Left" Margin="0,10.116,0,10.128" Width="12.078" Grid.Row="1" x:Name="ellipseDebut"/>
+							<Ellipse Fill="White" Stroke="{x:Null}" HorizontalAlignment="Left" Margin="0,10.116,0,10.128" Width="12.078" Grid.Row="1" x:Name="ellipseFin" RenderTransformOrigin="0.5,0.5">
+								<Ellipse.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform ScaleX="1" ScaleY="1"/>
+										<SkewTransform AngleX="0" AngleY="0"/>
+										<RotateTransform Angle="0"/>
+										<TranslateTransform X="{Binding Path=ActualWidth, ElementName=TrackBkgd, Mode=Default}" Y="0"/>
+									</TransformGroup>
+								</Ellipse.RenderTransform>
+							</Ellipse>
 							<Border x:Name="Track" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="Auto" Opacity="1" SnapsToDevicePixels="True" Background="Transparent" Grid.Row="1">
 								<Custom:SurfaceTrack x:Name="PART_Track" Grid.Row="1">
 									<Custom:SurfaceTrack.Thumb>
fingersdance