From 2aed6d0716797dfd6fb1238f76bced6710180508 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Tue, 5 Jan 2021 12:22:32 +0200 Subject: Fix ScrollChanged in JobOutlineControl Related Work Items: #4243 --- .../Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer') 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(); + _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged; _parentScrollViewer.ScrollChanged += ScrollViewer_ScrollChanged; } else if (_viewportHeight == 0) -- cgit v1.3.1