diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-31 10:06:51 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-31 10:06:51 +0300 |
| commit | b6b2f9ad4c96deface6763adbb2ac533e9706d1b (patch) | |
| tree | 732a7ce2f629ab4cd9a1bfc1bec79adf97185025 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging | |
| parent | 90b65a54cd28ee8b0d908c86795a7096c4073e83 (diff) | |
| parent | c728eba7cf217972c47e0a65afcb1975f6d6f6f1 (diff) | |
| download | Tango-b6b2f9ad4c96deface6763adbb2ac533e9706d1b.tar.gz Tango-b6b2f9ad4c96deface6763adbb2ac533e9706d1b.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs index 8004ef154..92d176671 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs @@ -44,7 +44,11 @@ namespace Tango.MachineStudio.Logging.Views private void ItemsControl_SizeChanged(object sender, SizeChangedEventArgs e) { TimelineEventGroup group = (sender as FrameworkElement).DataContext as TimelineEventGroup; - group.Height = e.NewSize.Height; + + if (group != null) + { + group.Height = e.NewSize.Height; + } } private void scrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e) |