diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-05 22:46:20 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-05 22:46:20 +0200 |
| commit | 6605bbc97d768eadf072b592b2fc62c297adfd92 (patch) | |
| tree | 15e699efcf849a12219198121698653c91a20bcb /Software/Visual_Studio/MachineStudio | |
| parent | e8578185b85e3957adc627c414d9ab3cc9bda463 (diff) | |
| parent | 5775356f93e5251d42c298c64d4a0583f49dcbd7 (diff) | |
| download | Tango-6605bbc97d768eadf072b592b2fc62c297adfd92.tar.gz Tango-6605bbc97d768eadf072b592b2fc62c297adfd92.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs index 68dc7e3bf..77ba4040e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs @@ -44,7 +44,6 @@ namespace Tango.MachineStudio.Developer.Controls public JobOutlineControl() : base() { - Unloaded += JobOutlineControl_Unloaded; DataContextChanged += JobOutlineControl_DataContextChanged; Width = WIDTH; } @@ -60,13 +59,6 @@ namespace Tango.MachineStudio.Developer.Controls } #region events - private void JobOutlineControl_Unloaded(object sender, RoutedEventArgs e) - { - if (_parentScrollViewer == null) - { - _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged; - } - } private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e) { @@ -87,6 +79,7 @@ namespace Tango.MachineStudio.Developer.Controls if (_parentScrollViewer == null) { _parentScrollViewer = this.FindAncestor<ScrollViewer>(); + _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged; _parentScrollViewer.ScrollChanged += ScrollViewer_ScrollChanged; } else if (_viewportHeight == 0) |