diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-03-20 13:13:52 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-03-20 13:13:52 +0200 |
| commit | 88ac356fd2d30e016bb884697e7b67f8ede51d2b (patch) | |
| tree | 37566213026964e30229c21474f1bd148fe8e695 /Software/Visual_Studio/PPC | |
| parent | 5881b11e25a34acc0230f5316db5783389afe18f (diff) | |
| download | Tango-88ac356fd2d30e016bb884697e7b67f8ede51d2b.tar.gz Tango-88ac356fd2d30e016bb884697e7b67f8ede51d2b.zip | |
Fixed issue with PPC "add job" button hiding the "delete job" button.
Removed message box on error in color lab module.
Diffstat (limited to 'Software/Visual_Studio/PPC')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs index cc9202b30..aef6dd549 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs @@ -607,7 +607,9 @@ namespace Tango.PPC.Jobs.ViewModels private async void ExportJob() { - var selected_job = SelectedJobs.First(); + var selected_job = SelectedJobs.FirstOrDefault(); + if (selected_job == null) return; + ClearSelection(); var result = await NavigationManager. diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml index 47a3df569..475437cf3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml @@ -59,6 +59,7 @@ <StackPanel.Style> <Style TargetType="StackPanel"> <Setter Property="Opacity" Value="0"></Setter> + <Setter Property="IsHitTestVisible" Value="False"></Setter> <Setter Property="RenderTransform"> <Setter.Value> <TranslateTransform X="100" /> @@ -66,6 +67,7 @@ </Setter> <Style.Triggers> <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True"> + <Setter Property="IsHitTestVisible" Value="True"></Setter> <DataTrigger.EnterActions> <BeginStoryboard> <Storyboard> @@ -119,6 +121,7 @@ <touch:TouchIconButton.Style> <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource TangoRoundTouchIconButton}"> <Setter Property="Opacity" Value="1"></Setter> + <Setter Property="IsHitTestVisible" Value="True"></Setter> <Setter Property="RenderTransform"> <Setter.Value> <ScaleTransform ScaleX="1" ScaleY="1" /> @@ -126,6 +129,7 @@ </Setter> <Style.Triggers> <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True"> + <Setter Property="IsHitTestVisible" Value="False"></Setter> <DataTrigger.EnterActions> <BeginStoryboard> <Storyboard> |