From 0dec8a74239cff769836cae577fbd84824070e83 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 21 Apr 2018 19:49:05 +0300
Subject: Implemented NavigationControl for better performance!!! Redesign of
 machine studio module initialization.

---
 .../Tango.MachineStudio.Developer/Views/MainView.xaml  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index c4915a4c8..a3ac2f3b9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -395,19 +395,11 @@
 
 
             <Grid Grid.Row="1">
-                <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
-                    <controls:MultiTransitionControl.Controls>
-                        <ContentControl Tag="MachineJobSelectionView">
-                            <local:MachineJobSelectionView/>
-                        </ContentControl>
-                        <ContentControl Tag="JobView">
-                            <local:JobView/>
-                        </ContentControl>
-                        <ContentControl Tag="RunningJobView">
-                            <local:RunningJobView/>
-                        </ContentControl>
-                    </controls:MultiTransitionControl.Controls>
-                </controls:MultiTransitionControl>
+                <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide" KeepElementsAttached="True">
+                    <local:MachineJobSelectionView controls:NavigationControl.NavigationName="MachineJobSelectionView" />
+                    <local:JobView controls:NavigationControl.NavigationName="JobView" />
+                    <local:RunningJobView controls:NavigationControl.NavigationName="RunningJobView" />
+                </controls:NavigationControl>
             </Grid>
         </Grid>
     </Grid>
-- 
cgit v1.3.1