diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-05 19:44:36 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-05 19:44:36 +0300 |
| commit | 25b7d63b202f85fa5af57f4d59c984e9afaf30c5 (patch) | |
| tree | af7315cf001aa37099c63f1971cf07f74ee46dbc /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 466b54210bc5066e6e29107d6c8f996f360b1426 (diff) | |
| download | Tango-25b7d63b202f85fa5af57f4d59c984e9afaf30c5.tar.gz Tango-25b7d63b202f85fa5af57f4d59c984e9afaf30c5.zip | |
Using LINQ to SQL Async methods in JobView.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
3 files changed, 5 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs index 6107a906d..293435d0b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs @@ -56,9 +56,10 @@ namespace Tango.PPC.UI.ViewModels NotificationProvider.ShowWarning("Email or password are incorrect."); } - ApplicationManager.ModulesInitialized += (_, __) => + ApplicationManager.ModulesInitialized += async (_, __) => { - NavigationManager.NavigateTo(NavigationView.HomeModule); + await Task.Delay(500); + await NavigationManager.NavigateTo(NavigationView.HomeModule); }; } } 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 78d040d27..c7d019981 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -115,7 +115,7 @@ </Border> <Grid Background="{StaticResource TangoKeyboardBackground}"> - <controls:NavigationControl x:Name="NavigationControl" x:FieldModifier="public" TransitionAlwaysFades="False" TransitionType="Zoom"> + <controls:NavigationControl x:Name="NavigationControl" x:FieldModifier="public" TransitionAlwaysFades="False" TransitionType="Zoom" KeepElementsAttached="True"> <!--MODULES GOES HERE--> </controls:NavigationControl> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml index 3347a20d6..6fbf713e9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LoginView.xaml @@ -21,7 +21,7 @@ <touch:TouchCheckBox Margin="0 30 0 0">Keep me logged in.</touch:TouchCheckBox> - <touch:TouchButton Height="60" Margin="0 30 0 0" CornerRadius="3" IsDefault="True" DelayCommand="{Binding LoginCommand}" DelayCommandDuration="00:00:0.5">LOGIN</touch:TouchButton> + <touch:TouchButton Height="60" Margin="0 30 0 0" CornerRadius="3" IsDefault="True" DelayCommand="{Binding LoginCommand}" DelayCommandDuration="00:00:0.2">LOGIN</touch:TouchButton> <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0">Forgot password?</TextBlock> </StackPanel> |
