Merge
authorcavaliet
Wed, 25 Nov 2009 10:48:46 +0100
changeset 230 010a2af88bb7
parent 229 05aba5def1fc (current diff)
parent 227 89f9e7e3ff54 (diff)
child 231 4eff6b0c9215
Merge
src/FingersDance/MainSurfaceWindow.xaml.cs
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs	Tue Nov 24 22:08:57 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs	Wed Nov 25 10:48:46 2009 +0100
@@ -43,6 +43,7 @@
         private UserControlUserPanel Panel4 = null;
         ActionGenerator _Factory = (new ActionFactory()).GetGenerator();
         private MainViewModel _mainviewmodel = new MainViewModel();
+        bool pivotContactDown = false;
         #endregion
 
 
@@ -328,24 +329,29 @@
             //Permet la MAJ des 4 Grids à la position du pivot
             try
             {
-                Grid1.Width = e.GetPosition(mainSurfaceWindow).X;
-                Grid1.Height = e.GetPosition(mainSurfaceWindow).Y;
+                if (!pivotContactDown)
+                {
+                    Grid1.Width = e.GetPosition(mainSurfaceWindow).X;
+                    Grid1.Height = e.GetPosition(mainSurfaceWindow).Y;
 
-                Grid3.Width = e.GetPosition(mainSurfaceWindow).X;
-                Grid3.Height = 768 - e.GetPosition(mainSurfaceWindow).Y;
+                    Grid3.Width = e.GetPosition(mainSurfaceWindow).X;
+                    Grid3.Height = 768 - e.GetPosition(mainSurfaceWindow).Y;
 
-                Grid4.Width = 1024 - e.GetPosition(mainSurfaceWindow).X;
-                Grid4.Height = 768 - e.GetPosition(mainSurfaceWindow).Y;
+                    Grid4.Width = 1024 - e.GetPosition(mainSurfaceWindow).X;
+                    Grid4.Height = 768 - e.GetPosition(mainSurfaceWindow).Y;
 
-                Grid2.Width = 1024 - e.GetPosition(mainSurfaceWindow).X;
-                Grid2.Height = e.GetPosition(mainSurfaceWindow).Y;
-                ((ScatterViewItem)sender).Center = new Point(e.GetPosition(mainSurfaceWindow).X,e.GetPosition(mainSurfaceWindow).Y);
+                    Grid2.Width = 1024 - e.GetPosition(mainSurfaceWindow).X;
+                    Grid2.Height = e.GetPosition(mainSurfaceWindow).Y;
+                    ((ScatterViewItem)sender).Center = new Point(e.GetPosition(mainSurfaceWindow).X, e.GetPosition(mainSurfaceWindow).Y);
+                }
+                pivotContactDown = false;
             }
             catch (Exception) { }
         }
 
         private void UserControlPivot_EH_SurfaceButtonPlayer_ContactDown(object sender, EventArgs e)
         {
+            pivotContactDown = true;
             //  Traitement du contact down sur le pivot (Création d'un screen ou suppression d'un panel
             switch ((int)sender)
             {
@@ -442,7 +448,6 @@
                     }
                     break;
             }
-
         }
 
         #endregion