diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-30 12:56:21 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-30 12:56:21 +0300 |
| commit | e48e4ed7f4eaa2aee13d77109b8b6513e28a6ab4 (patch) | |
| tree | 6a80c388764198f1b9267e519700bf459fa22134 /Software/Visual_Studio/PPC/Modules | |
| parent | 3e20011a1f21e33c3323a5616d30e1056fa69efd (diff) | |
| parent | a2d104e970718b50420fbe3e13908c847799c9eb (diff) | |
| download | Tango-e48e4ed7f4eaa2aee13d77109b8b6513e28a6ab4.tar.gz Tango-e48e4ed7f4eaa2aee13d77109b8b6513e28a6ab4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml | 12 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs | 19 |
2 files changed, 18 insertions, 13 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index 136644f5c..da46f31ff 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -491,7 +491,7 @@ </touch:TouchExpander> </touch:TouchVirtualizedContentControl> - <Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40"> + <touch:TouchDropShadowBorder Margin="0 12 0 0" Padding="0 0 0 40"> <Grid> <StackPanel> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> @@ -614,10 +614,10 @@ </DockPanel> </StackPanel> </Grid> - </Border> + </touch:TouchDropShadowBorder> <touch:TouchVirtualizedContentControl Margin="0 20 0 0"> - <Border Style="{StaticResource TangoTouchBorder}" Padding="0 0 0 50" Visibility="{Binding Job.EmbroideryFileData,Converter={StaticResource IsNullToVisibilityConverter}}"> + <touch:TouchDropShadowBorder Padding="0 0 0 50" Visibility="{Binding Job.EmbroideryFileData,Converter={StaticResource IsNullToVisibilityConverter}}"> <StackPanel> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> <Image Source="../Images/embroidery.png" RenderOptions.BitmapScalingMode="Fant" Width="39" /> @@ -635,11 +635,11 @@ </DockPanel> </StackPanel> </StackPanel> - </Border> + </touch:TouchDropShadowBorder> </touch:TouchVirtualizedContentControl> <touch:TouchVirtualizedContentControl Margin="0 20 0 0" > - <Border Style="{StaticResource TangoTouchBorder}" Padding="0 0 0 50"> + <touch:TouchDropShadowBorder Padding="0 0 0 50"> <StackPanel> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> <Image Source="../Images/JobView/job-summary.png" Width="39" /> @@ -687,7 +687,7 @@ </DockPanel> </StackPanel> </StackPanel> - </Border> + </touch:TouchDropShadowBorder> </touch:TouchVirtualizedContentControl> <StackPanel HorizontalAlignment="Center" Margin="20 40 0 40" Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs index ceac18e38..23785881d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs @@ -28,17 +28,22 @@ namespace Tango.PPC.Jobs.Views TangoIOC.Default.Register<IJobsView>(this); } - private void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e) + private async void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e) { if (dataGridJobs != null) { - //await Task.Delay(200); + await Task.Delay(200); - //dataGridJobs.LayoutRows(false); - //dataGridJobs.ScrollViewer.ScrollToTop(); - - //dataGridJobsHistory.LayoutRows(false); - //dataGridJobsHistory.ScrollViewer.ScrollToTop(); + if (navigationLinks.SelectedIndex == 0) + { + dataGridJobs.LayoutRows(false); + dataGridJobs.ScrollViewer.ScrollToTop(); + } + else + { + dataGridJobsHistory.LayoutRows(false); + dataGridJobsHistory.ScrollViewer.ScrollToTop(); + } } } |