diff options
Diffstat (limited to 'Software/Visual_Studio')
2 files changed, 2 insertions, 16 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) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs index 78f8c90a1..fb02c6c6e 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobOutlineControl.cs @@ -45,7 +45,6 @@ namespace Tango.PPC.Jobs public JobOutlineControl() : base() { - Unloaded += JobOutlineControl_Unloaded; DataContextChanged += JobOutlineControl_DataContextChanged; Width = WIDTH; } @@ -66,13 +65,6 @@ namespace Tango.PPC.Jobs } #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) { @@ -94,6 +86,7 @@ namespace Tango.PPC.Jobs if (_parentScrollViewer == null) { _parentScrollViewer = this.FindAncestor<ScrollViewer>(); + _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged; _parentScrollViewer.ScrollChanged += ScrollViewer_ScrollChanged; } else if (_viewportHeight == 0) |