Mercurial Mercurial > fingersdance / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/FingersDance.Control.Player/UserControlPlayer.xaml
changeset 202 e15e7110ef6d
parent 197 3455e574e096
child 215 d13dbcf861d7 
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml	Sat Nov 14 19:07:51 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml	Mon Nov 16 18:06:15 2009 +0100
@@ -163,23 +163,22 @@
     	<Viewbox Margin="0,0,0,0" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Stretch="Uniform" AllowDrop="True">
     		<Grid Width="560" Height="400" HorizontalAlignment="Left" x:Name="GridPlayer">
     			<Grid.RowDefinitions>
-    				<RowDefinition Height="0.305*"/>
-    				<RowDefinition Height="0.593*"/>
+    				<RowDefinition Height="0.898*"/>
     				<RowDefinition Height="0.102*"/>
     			</Grid.RowDefinitions>
     			<Grid.ColumnDefinitions>
     				<ColumnDefinition Width="0.912*"/>
     				<ColumnDefinition Width="0.088*"/>
     			</Grid.ColumnDefinitions>
-    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-0.498,0,11.298" x:Name="usercontrolInfoUser" Grid.ColumnSpan="1" Grid.Row="2" Height="30"/>
-    			<MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" Grid.RowSpan="2" />
-    			<StackPanel Opacity="1" Background="{x:Null}" x:Name="StackPanelAnnotation" Height="Auto" d:LayoutOverrides="Height" Margin="-1,77.8,0,0" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2">
+    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-0.498,0,11.298" x:Name="usercontrolInfoUser" Grid.Column="0" Grid.Row="1" Height="30"/>
+    			<MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" Grid.Column="0" Grid.Row="0" />
+    			<StackPanel Opacity="1" Background="{x:Null}" x:Name="StackPanelAnnotation" Height="Auto" d:LayoutOverrides="Height" Margin="0,77,0,0" Grid.Column="1" Grid.Row="0">
     				<Rectangle x:Name="rect1" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" Margin="0.14,0"/>
     				<Rectangle x:Name="rect2" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
     				<Rectangle x:Name="rect3" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
     				<Rectangle x:Name="rect4" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" VerticalAlignment="Bottom"/>
     			</StackPanel>
-                <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="1" GestureEvent="GestureDetected"/>
+                <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="0" GestureEvent="GestureDetected"/>
     		</Grid>
     	</Viewbox>
     </Grid>
fingersdance