Panels visibility
Pivot Position OnContactLeave
UserPanel Close
"UserTest" removed
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Tue Nov 24 07:50:17 2009 +0100
@@ -55,8 +55,8 @@
MediaElementVideo.UnloadedBehavior = MediaState.Manual;
//SAR
//Control User Info
- usercontrolInfoUser.LabelSession.Content = "Seance Test";
- usercontrolInfoUser.LabelUser.Content = "User Test";
+ usercontrolInfoUser.LabelSession.Content = "";//"Seance Test";
+ usercontrolInfoUser.LabelUser.Content = "";//"User Test";
MediaElementVideo.Volume = 0;
}
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs Tue Nov 24 07:50:17 2009 +0100
@@ -132,7 +132,9 @@
{
if (!UCTimeLine.IsDragging)
{
- UCTimeLine.Slider.Value = UserControlPlayer.Player.Position.TotalMilliseconds;
+
+ UCTimeLine.Slider.Value = UserControlPlayer.Player.Position.TotalMilliseconds;
+
}
int SliderValue = (int)UCTimeLine.Slider.Value;
if (UCTimeLine.FinishedDragging)
@@ -161,6 +163,14 @@
UserControlPlayer.playerPause();
}
+ public void SyncSourceClose()
+ {
+ //TimeLine and Player To Null
+ UCTimeLine.TimerTick -= UserControlTimeLine_TimerTick;
+ UCTimeLine = null;
+ UserControlPlayer.playerStop();
+ UserControlPlayer = null;
+ }
public void UserControlPlayer_NewGestureRegognized(object sender, EventArgs e)
{
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs Tue Nov 24 07:50:17 2009 +0100
@@ -490,9 +490,7 @@
{
NewGestureRecognized(this, new NewGestureRecognizedEventArg(gestureName));
}
-
-
- }
+ }
/// <summary>
--- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml.cs Tue Nov 24 07:50:17 2009 +0100
@@ -197,6 +197,17 @@
UserControlSyncSource.setUserPlayerMute(b);
}
+ public void PanelVisibility(Visibility v)
+ {
+ this.Visibility = v;
+ }
+
+ public void PanelClose()
+ {
+ UserControlSyncSource.SyncSourceClose();
+ UserControlSyncSource = null;
+ }
+
private void UserControlSyncSource_OnSuccessAnnotation(object sender, EventArgs e)
{
OnSuccessAnnotation(this, new EventArgs());
--- a/src/FingersDance/MainSurfaceWindow.xaml Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml Tue Nov 24 07:50:17 2009 +0100
@@ -191,7 +191,7 @@
</s:SurfaceScrollViewer>
</Grid>
<s:ScatterView x:Name="scaterview" ContactChanged="scaterview_ContactChanged">
- <s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" ContactChanged="ScatterViewItemPivot_ContactChanged" Style="{DynamicResource FingersDance.Control.ScatterView}" BorderBrush="{x:Null}" Foreground="{x:Null}" >
+ <s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" ContactChanged="ScatterViewItemPivot_ContactChanged" Style="{DynamicResource FingersDance.Control.ScatterView}" BorderBrush="{x:Null}" Foreground="{x:Null}" ContactLeave="ScatterViewItemPivot_ContactLeave" >
<FingersDance_Control_Pivot:UserControlPivot x:Name="UserControlPivot" EH_SurfaceButtonPlayer_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer_ContactDown"/>
</s:ScatterViewItem>
</s:ScatterView>
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs Mon Nov 23 18:36:27 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Tue Nov 24 07:50:17 2009 +0100
@@ -219,8 +219,12 @@
try
{
if (Panel1 != null)
+ {
Panel1.PlayerPause();
+ Panel1.PanelVisibility(Visibility.Hidden);
+ }
Grid1.Children[1].Visibility = Visibility.Hidden;
+
}
catch (Exception) { }
}
@@ -228,7 +232,11 @@
{
try
{
- Grid1.Children[1].Visibility = Visibility.Visible;
+ Grid1.Children[1].Visibility = Visibility.Visible;
+ if (Panel1 != null)
+ {
+ Panel1.PanelVisibility(Visibility.Visible);
+ }
}
catch (Exception) { }
}
@@ -238,7 +246,10 @@
try
{
if (Panel2 != null)
+ {
Panel2.PlayerPause();
+ Panel2.PanelVisibility(Visibility.Hidden);
+ }
Grid2.Children[1].Visibility = Visibility.Hidden;
}
catch (Exception) { }
@@ -247,7 +258,11 @@
{
try
{
- Grid2.Children[1].Visibility = Visibility.Visible;
+ Grid2.Children[1].Visibility = Visibility.Visible;
+ if (Panel2 != null)
+ {
+ Panel2.PanelVisibility(Visibility.Visible);
+ }
}
catch (Exception) { }
}
@@ -257,7 +272,10 @@
try
{
if (Panel3 != null)
+ {
Panel3.PlayerPause();
+ Panel3.PanelVisibility(Visibility.Hidden);
+ }
Grid3.Children[1].Visibility = Visibility.Hidden;
}
catch (Exception) { }
@@ -266,7 +284,11 @@
{
try
{
- Grid3.Children[1].Visibility = Visibility.Visible;
+ Grid3.Children[1].Visibility = Visibility.Visible;
+ if (Panel3 != null)
+ {
+ Panel3.PanelVisibility(Visibility.Visible);
+ }
}
catch (Exception) { }
}
@@ -276,7 +298,10 @@
try
{
if (Panel4 != null)
+ {
Panel4.PlayerPause();
+ Panel4.PanelVisibility(Visibility.Hidden);
+ }
Grid4.Children[1].Visibility = Visibility.Hidden;
}
catch (Exception) { }
@@ -286,6 +311,10 @@
try
{
Grid4.Children[1].Visibility = Visibility.Visible;
+ if (Panel4 != null)
+ {
+ Panel4.PanelVisibility(Visibility.Visible);
+ }
}
catch (Exception) { }
}
@@ -293,6 +322,28 @@
catch (Exception) { }
}
+ //SAR
+ private void ScatterViewItemPivot_ContactLeave(object sender, ContactEventArgs e)
+ {
+ //Permet la MAJ des 4 Grids à la position du pivot
+ try
+ {
+ 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;
+
+ 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);
+ }
+ catch (Exception) { }
+ }
+
private void UserControlPivot_EH_SurfaceButtonPlayer_ContactDown(object sender, EventArgs e)
{
// Traitement du contact down sur le pivot (Création d'un screen ou suppression d'un panel
@@ -502,21 +553,25 @@
case 1:
UserControlPivot.ApplyColor(1, 0);
root.Children.Remove(Panel1);
+ Panel1.PanelClose();
Panel1 = null;
break;
case 2:
UserControlPivot.ApplyColor(2, 0);
root.Children.Remove(Panel2);
+ Panel2.PanelClose();
Panel2 = null;
break;
case 3:
UserControlPivot.ApplyColor(3, 0);
root.Children.Remove(Panel3);
+ Panel3.PanelClose();
Panel3 = null;
break;
case 4:
UserControlPivot.ApplyColor(4, 0);
root.Children.Remove(Panel4);
+ Panel4.PanelClose();
Panel4 = null;
break;
}
@@ -651,5 +706,7 @@
CreditsScroll4.Visibility = (CreditsScroll4.Visibility == Visibility.Hidden) ? Visibility.Visible : Visibility.Hidden;
}
}
+
+
}
}
\ No newline at end of file