diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-07 19:27:19 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-07 19:27:19 +0300 |
| commit | 4635d671ecc0ac65372ebaaa7044230f44317c77 (patch) | |
| tree | 6630bf6940552c46ae2d0f90632d2c5fff4d848a /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 51f0a70bca80ccad4eae7c4abf0c09a6215540a9 (diff) | |
| parent | 952b8d7f3c81d6943d0bbf665b74ff58ab8c1201 (diff) | |
| download | Tango-4635d671ecc0ac65372ebaaa7044230f44317c77.tar.gz Tango-4635d671ecc0ac65372ebaaa7044230f44317c77.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
3 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index a6fbaa3ce..24512bf27 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.0.22.0")] +[assembly: AssemblyVersion("1.0.23.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 18c8cc7ae..82a57a22b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -283,7 +283,7 @@ </Border> <Grid Background="{StaticResource TangoKeyboardBackground}"> - <controls:NavigationControl x:Name="NavigationControl" x:FieldModifier="public" TransitionAlwaysFades="False" TransitionType="Zoom" KeepElementsAttached="True"> + <controls:NavigationControl x:Name="NavigationControl" x:FieldModifier="public" TransitionAlwaysFades="False" TransitionType="Zoom" KeepElementsAttached="False"> <!--MODULES GOES HERE--> </controls:NavigationControl> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml index 604c79aeb..9899e60d4 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml @@ -82,7 +82,7 @@ </Border> </touch:TouchPanel.TaskBarElement> - <controls:NavigationControl TransitionAlwaysFades="True" KeepElementsAttached="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public"> + <controls:NavigationControl TransitionAlwaysFades="True" KeepElementsAttached="False" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public"> <local:LoadingView></local:LoadingView> <local:LoadingErrorView></local:LoadingErrorView> <local:NoPermissionsView></local:NoPermissionsView> |