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.
Create Branche ScreenControl
authorsarias
Wed, 23 Sep 2009 09:49:23 +0200
changeset 79 b13d98b59241
parent 77 e95e916eb018
child 80 605e2e2e053f
Create Branche ScreenControl
src/FingersDance.Control.Screen/UserControlScreen.xaml file | annotate | diff | comparison | revisions
src/FingersDance.Views/TimelineView.xaml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.Screen/UserControlScreen.xaml	Sun Sep 20 18:02:37 2009 +0200
+++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml	Wed Sep 23 09:49:23 2009 +0200
@@ -11,29 +11,7 @@
 	d:DesignWidth="640" d:DesignHeight="480" Width="1024" Height="768" xmlns:Custom="http://schemas.microsoft.com/surface/2008">
 
     <Grid x:Name="LayoutRoot">
-    	<Custom:ScatterView HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{x:Null}" ContactChanged="ScatterViewPivot_ContactChanged" x:Name="ScatterViewPivot">
-    		<Custom:ScatterViewItem x:Name="ScatterViewItemPivot" ContactChanged="ScatterViewItemPivot_ContactChanged">
-    			<FingersDance_Control_Pivot:UserControlPivot Height="52" x:Name="UserControlPivot"  Width="52" Foreground="{x:Null}"  />
-    		</Custom:ScatterViewItem>
-    	</Custom:ScatterView>
-
-    	<Grid HorizontalAlignment="Left" x:Name="Grid1" VerticalAlignment="Top" Width="100" Height="100">
-    		<Rectangle x:Name="Rectangle1" Fill="{x:Null}" Stroke="#FF000000"/>
-            
-    		<!--<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserPanel1"/>-->
-    	</Grid>
-    	<Grid HorizontalAlignment="Right" Margin="0,0,8,0" x:Name="Grid2" VerticalAlignment="Top" Width="100" Height="100">
-    		<Rectangle x:Name="Rectangle2" Fill="{x:Null}" Stroke="#FF000000"/>
-    		<!--<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserPanel2"/>-->
-    	</Grid>
-    	<Grid HorizontalAlignment="Left" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100">
-    		<Rectangle x:Name="Rectangle3" Fill="{x:Null}" Stroke="#FF000000"/>
-    		<!--<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserPanel3"/>-->
-    	</Grid>
-    	<Grid HorizontalAlignment="Right" x:Name="Grid4" VerticalAlignment="Bottom" Width="100" Height="100">
-    		<Rectangle x:Name="Rectangle4" Fill="{x:Null}" Stroke="#FF000000"/>
-    		<!--<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserPanel4"/>-->
-    	</Grid>
+    	<Custom:ScatterView HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{x:Null}" ContactChanged="ScatterViewPivot_ContactChanged" x:Name="ScatterViewScreen"/>
 
     </Grid>
 
--- a/src/FingersDance.Views/TimelineView.xaml	Sun Sep 20 18:02:37 2009 +0200
+++ b/src/FingersDance.Views/TimelineView.xaml	Wed Sep 23 09:49:23 2009 +0200
@@ -5,7 +5,7 @@
     >
     <Grid>
         <ListView DataContext="{Binding Path=AnnotList}"
-                  ItemsSource="{Binding}" Background="Black" BorderThickness="0" >
+                  ItemsSource="{Binding}" Background="{x:Null}" BorderThickness="0" >
 
             <ListView.ItemTemplate>
                 <DataTemplate>
fingersdance