--- a/.hgignore Tue Sep 15 14:53:12 2009 +0200
+++ b/.hgignore Tue Sep 15 15:40:40 2009 +0200
@@ -33,3 +33,5 @@
glob:*.suo
glob:*.cache
glob:*.csproj.user
+glob:desktop.ini
+glob:*.orig
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml Tue Sep 15 14:53:12 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml Tue Sep 15 15:40:40 2009 +0200
@@ -22,7 +22,7 @@
<ColumnDefinition Width="0.506*"/>
<ColumnDefinition Width="0.494*"/>
</Grid.ColumnDefinitions>
- <Ellipse Stroke="#FF000000" Grid.ColumnSpan="2" Grid.RowSpan="2">
+ <Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="1.5">
<Ellipse.Fill>
<RadialGradientBrush>
<RadialGradientBrush.RelativeTransform>
@@ -69,7 +69,7 @@
</TransformGroup>
</Custom:SurfaceButton.RenderTransform>
</Custom:SurfaceButton>
- <Ellipse Height="17.573" HorizontalAlignment="Right" VerticalAlignment="Top" Width="17.573" Margin="0,-8.742,-8.566,0" Grid.Row="1" Fill="{x:Null}">
+ <Ellipse Height="17.573" HorizontalAlignment="Right" VerticalAlignment="Top" Width="17.573" Margin="0,-8.742,-8.566,0" Grid.Row="1" Fill="{x:Null}" StrokeThickness="1.5">
<Ellipse.Stroke>
<RadialGradientBrush>
<GradientStop Color="#FF8A8888" Offset="0"/>
--- a/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 14:53:12 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 15:40:40 2009 +0200
@@ -63,8 +63,8 @@
<FingersDance_Control_UserPanel:UserControlUserPanel/>
</Grid>
<s:ScatterView x:Name="ScaterView" ContactChanged="ScaterView_ContactChanged">
- <s:ScatterViewItem CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" >
- <FingersDance_Control_Pivot:UserControlPivot/>
+ <s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" >
+ <FingersDance_Control_Pivot:UserControlPivot x:Name="UserControlPivot"/>
</s:ScatterViewItem>
</s:ScatterView>
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs Tue Sep 15 14:53:12 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Tue Sep 15 15:40:40 2009 +0200
@@ -33,10 +33,33 @@
{
InitializeComponent();
+ //Permet d'initialiser les quand Grid à la position initiale du pivot
+ InitGridPositions();
// Add handlers for Application activation events
AddActivationHandlers();
}
+ private void InitGridPositions()
+ {
+ //Initialise les 4 Grids à la positions initiale du Pivot.
+ try
+ {
+ ScatterViewItem item = (ScatterViewItem)ScaterView.Items.GetItemAt(0);
+ Grid1.Width =item.Center.X;
+ Grid1.Height = item.Center.Y;
+
+ Grid2.Width = item.Center.X;
+ Grid2.Height = 768 - item.Center.Y;
+
+ Grid3.Width = 1024 - item.Center.X;
+ Grid3.Height = 768 - item.Center.Y;
+
+ Grid4.Width = 1024 - item.Center.X;
+ Grid4.Height = item.Center.Y;
+ }
+ catch (Exception ex) { }
+ }
+
/// <summary>
/// Occurs when the window is about to close.
@@ -106,6 +129,7 @@
private void ScaterView_ContactChanged(object sender, ContactEventArgs e)
{
+ //Permet la MAJ des 4 Grids à la position du pivot
try
{
Grid1.Width = e.GetPosition(mainSurfaceWindow).X;