Skip to content

Commit 8bb9579

Browse files
committed
fix: sync scroll in side-by-side diff does not working after commit 7caa03a
Signed-off-by: leo <[email protected]>
1 parent 56253e9 commit 8bb9579

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/Views/TextDiffView.axaml.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,8 +1450,6 @@ protected override void OnLoaded(RoutedEventArgs e)
14501450
_scrollViewer.ScrollChanged += OnTextViewScrollChanged;
14511451
_scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("SyncScrollOffset", BindingMode.OneWay));
14521452
}
1453-
1454-
TextArea.PointerWheelChanged += OnTextAreaPointerWheelChanged;
14551453
}
14561454

14571455
protected override void OnUnloaded(RoutedEventArgs e)
@@ -1463,8 +1461,6 @@ protected override void OnUnloaded(RoutedEventArgs e)
14631461
_scrollViewer = null;
14641462
}
14651463

1466-
TextArea.PointerWheelChanged -= OnTextAreaPointerWheelChanged;
1467-
14681464
base.OnUnloaded(e);
14691465
GC.Collect();
14701466
}
@@ -1507,16 +1503,10 @@ private void OnTextViewScrollGotFocus(object sender, GotFocusEventArgs e)
15071503

15081504
private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
15091505
{
1510-
if (TextArea.IsFocused && DataContext is ViewModels.TwoSideTextDiff diff)
1506+
if (IsPointerOver && DataContext is ViewModels.TwoSideTextDiff diff)
15111507
diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
15121508
}
15131509

1514-
private void OnTextAreaPointerWheelChanged(object sender, PointerWheelEventArgs e)
1515-
{
1516-
if (!TextArea.IsFocused)
1517-
Focus();
1518-
}
1519-
15201510
private ScrollViewer _scrollViewer = null;
15211511
}
15221512

0 commit comments

Comments
 (0)