diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-04-21 19:49:05 +0300 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-04-21 19:49:05 +0300 |
| commit | 0dec8a74239cff769836cae577fbd84824070e83 (patch) | |
| tree | d6cc24ee53454b3f17f1580e90de38238555b6bd /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views | |
| parent | 4df1724226c0d0941b970dbe71b1476e3c3e9902 (diff) | |
| download | Tango-0dec8a74239cff769836cae577fbd84824070e83.tar.gz Tango-0dec8a74239cff769836cae577fbd84824070e83.zip | |
Implemented NavigationControl for better performance!!!
Redesign of machine studio module initialization.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml | 18 |
1 files changed, 5 insertions, 13 deletions
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> |