aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2021-01-05 10:39:44 +0000
committerRoy Ben Shabat <Roy@twine-s.com>2021-01-05 10:39:44 +0000
commited8bc97f1d5af60b8dd9777a52bcd680ce84ea2d (patch)
tree29976a2fb3aeab97b8aca5a5a40dc2da83c1dfbd /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
parent0567570ce97b80f264c7b9f4a632b99eb80c1a17 (diff)
parent2aed6d0716797dfd6fb1238f76bced6710180508 (diff)
downloadTango-ed8bc97f1d5af60b8dd9777a52bcd680ce84ea2d.tar.gz
Tango-ed8bc97f1d5af60b8dd9777a52bcd680ce84ea2d.zip
Merged PR 11: Fix ScrollChanged in JobOutlineControl
Fix ScrollChanged in JobOutlineControl Related Work Items: #4243 Related work items: #4243
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs9
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)