Skip to content

[BUG] Fix: AutoScrollToFirstChange() was not working reliably for Side-By-Side Diff #1952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
goran-w wants to merge 2 commits into from
Closed

[BUG] Fix: AutoScrollToFirstChange() was not working reliably for Side-By-Side Diff #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b5babb
Make AutoScrollToFirstChange() work reliably in Side-By-Side Diff
goran-w Dec 3, 2025
ebc8d27
Bonus: Cleanup and simplify the use of Block Navigation
goran-w Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/ViewModels/DiffContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ public void CheckSettings()

if (ctx.IsSideBySide() != UseSideBySide)
{
ctx = ctx.SwitchMode();
Content = ctx;
Content = ctx.SwitchMode();
}
}
}
Expand Down
75 changes: 21 additions & 54 deletions src/Views/TextDiffView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,44 +487,38 @@ public virtual void UpdateSelectedChunk(double y)
{
}

public virtual void GotoFirstChange()
protected virtual void SyncScrollOffset()
{
var first = BlockNavigation.GotoFirst();
if (first != null)
{
TextArea.Caret.Line = first.Start;
ScrollToLine(first.Start);
}
}

public virtual void GotoPrevChange()
private void GotoChange(ViewModels.BlockNavigation.Block block)
{
var prev = BlockNavigation.GotoPrev();
if (prev != null)
if (block != null)
{
TextArea.Caret.Line = prev.Start;
ScrollToLine(prev.Start);
TextArea.Caret.Line = block.Start;
ScrollToLine(block.Start);
SyncScrollOffset();
}
}

public virtual void GotoNextChange()
public void GotoFirstChange()
{
var next = BlockNavigation.GotoNext();
if (next != null)
{
TextArea.Caret.Line = next.Start;
ScrollToLine(next.Start);
}
GotoChange(BlockNavigation.GotoFirst());
}

public virtual void GotoLastChange()
public void GotoPrevChange()
{
var next = BlockNavigation.GotoLast();
if (next != null)
{
TextArea.Caret.Line = next.Start;
ScrollToLine(next.Start);
}
GotoChange(BlockNavigation.GotoPrev());
}

public void GotoNextChange()
{
GotoChange(BlockNavigation.GotoNext());
}

public void GotoLastChange()
{
GotoChange(BlockNavigation.GotoLast());
}

public override void Render(DrawingContext context)
Expand Down Expand Up @@ -805,9 +799,6 @@ private void AutoScrollToFirstChange()
if (DataContext is not ViewModels.TextDiffContext ctx)
return;

if (ctx.IsSideBySide() && !IsOld)
return;

var curBlock = ctx.BlockNavigation.GetCurrentBlock();
if (curBlock == null)
return;
Expand Down Expand Up @@ -1098,30 +1089,6 @@ public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
return [];
}

public override void GotoFirstChange()
{
base.GotoFirstChange();
SyncScrollOffset();
}

public override void GotoPrevChange()
{
base.GotoPrevChange();
SyncScrollOffset();
}

public override void GotoNextChange()
{
base.GotoNextChange();
SyncScrollOffset();
}

public override void GotoLastChange()
{
base.GotoLastChange();
SyncScrollOffset();
}

public override void UpdateSelectedChunk(double y)
{
if (DataContext is not ViewModels.TwoSideTextDiff diff)
Expand Down Expand Up @@ -1318,7 +1285,7 @@ private void OnBlockNavigationPropertyChanged(object sender, PropertyChangedEven
TextArea?.TextView?.Redraw();
}

private void SyncScrollOffset()
protected override void SyncScrollOffset()
{
if (_scrollViewer is not null && DataContext is ViewModels.TwoSideTextDiff diff)
diff.ScrollOffset = _scrollViewer.Offset;
Expand Down
Loading