equal
deleted
inserted
replaced
3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
4 xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
4 xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
5 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
5 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
6 mc:Ignorable="d" |
6 mc:Ignorable="d" |
7 xmlns:vw="clr-namespace:FingersDance.Views;assembly=FingersDance.Views" |
7 xmlns:vw="clr-namespace:FingersDance.Views;assembly=FingersDance.Views" |
|
8 xmlns:popup="clr-namespace:FingersDance.Control.Close;assembly=FingersDance.Control.Close" |
8 xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic" |
9 xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic" |
9 x:Class="FingersDance.Control.TimeLine.UserControlTimeLine" |
10 x:Class="FingersDance.Control.TimeLine.UserControlTimeLine" |
10 x:Name="UserControl" |
11 x:Name="UserControl" |
11 d:DesignWidth="383" Background="{x:Null}" d:DesignHeight="33"> |
12 d:DesignWidth="383" Background="{x:Null}" d:DesignHeight="33"> |
12 |
13 |
13 <UserControl.Resources> |
14 <UserControl.Resources> |
14 <Style x:Key="FingersDance.Control.Slider" TargetType="{x:Type Custom:SurfaceSlider}"> |
15 <Style x:Key="FingersDance.Control.Slider" TargetType="{x:Type Custom:SurfaceSlider}"> |
779 |
780 |
780 <Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}"> |
781 <Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}"> |
781 <Custom:SurfaceSlider Height="Auto" x:Name="slider" Value="0.5" Width="Auto" |
782 <Custom:SurfaceSlider Height="Auto" x:Name="slider" Value="0.5" Width="Auto" |
782 Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" /> |
783 Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" /> |
783 <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}"/> |
784 <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}"/> |
|
785 <popup:UserControlClose x:Name="confirmCancelPopup" Question="Êtes-vous de sûr de vouloir effacer cette annotation ?" Visibility="Hidden" ConfirmYesOrNo="confirmCancelPopup_ConfirmYesOrNo" /> |
784 </Grid> |
786 </Grid> |
785 </UserControl> |
787 </UserControl> |