Visual change for the annotations to be as close as possible to the cursor's timeline.
authorcavaliet
Mon, 26 Oct 2009 16:03:34 +0100
changeset 175 1d4b6d6474d5
parent 174 45c9e55fcf23
child 176 0896f36b9d57
Visual change for the annotations to be as close as possible to the cursor's timeline.
src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml
src/FingersDance.Views/TimelineView.xaml
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Mon Oct 26 09:27:23 2009 +0100
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Mon Oct 26 16:03:34 2009 +0100
@@ -786,17 +786,6 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        <Style x:Key="TimelineViewStyle1" TargetType="{x:Type vw:TimelineView}">
-        	<Setter Property="Template">
-        		<Setter.Value>
-        			<ControlTemplate TargetType="{x:Type vw:TimelineView}">
-        				<Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
-        					<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-        				</Border>
-        			</ControlTemplate>
-        		</Setter.Value>
-        	</Setter>
-        </Style>
         <Style x:Key="SurfaceSliderStylePause" TargetType="{x:Type Custom:SurfaceSlider}">
             <Setter Property="Background" Value="#191B2022"/>
             <Setter Property="BorderBrush" Value="#3F040404"/>
@@ -1576,7 +1565,7 @@
     <Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}">
         <Custom:SurfaceSlider  Height="Auto" x:Name="slider" Value="0.5" Width="Auto" 
                                Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" />
-        <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}" Style="{DynamicResource TimelineViewStyle1}"/>
+        <vw:TimelineView x:Name="tv" Margin="0,5,0,0" Background="{x:Null}" />
         <popup:UserControlClose x:Name="confirmCancelPopup" Question="Êtes-vous de sûr de vouloir effacer cette annotation ?" Visibility="Hidden" ConfirmYesOrNo="confirmCancelPopup_ConfirmYesOrNo" />
     </Grid>
 </UserControl>
\ No newline at end of file
--- a/src/FingersDance.Views/TimelineView.xaml	Mon Oct 26 09:27:23 2009 +0100
+++ b/src/FingersDance.Views/TimelineView.xaml	Mon Oct 26 16:03:34 2009 +0100
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vw="clr-namespace:FingersDance.Views"
     xmlns:Custom="http://schemas.microsoft.com/surface/2008"
-    Width="1700" >
+    Width="1700" Height="40">
     <UserControl.Resources>
         <DataTemplate x:Key="slbDataTemplate">
             <vw:TimelineAnnotationView/>
@@ -13,12 +13,12 @@
             <Grid></Grid>
             <Canvas></Canvas>
             -->
-            <StackPanel Orientation="Horizontal"/>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="0,-5,0,0" />
 
         </ItemsPanelTemplate>
     </UserControl.Resources>
     <Grid>
-        <Custom:SurfaceListBox Background="{x:Null}" x:Name="listview" x:FieldModifier="public" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderThickness="2"
+        <Custom:SurfaceListBox Height="40" Background="{x:Null}" x:Name="listview" x:FieldModifier="public" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                                ItemsSource="{Binding Path=AnnotList}" ItemTemplate="{StaticResource slbDataTemplate}" ItemsPanel="{StaticResource slbItemsPanelTemplate}"
                                >