mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 12:15:00 +00:00

* Corrected misspelled local variable nextHigh(t)light * Implemented change-block navigation * Modified behavior of the Prev/Next Change buttons in DiffView toolbar. * Well-defined change-blocks are pre-calculated and can be navigated between. * Current change-block is highlighted in the Diff panel(s). * Prev/next at start/end of range (re-)scrolls to first/last change-block (I.e when unset, or already at first/last change-block, or at the only one.) * Current change-block is unset in RefreshContent(). * Added safeguards for edge cases * Added indicator of current/total change-blocks in DiffView toolbar * Added new Icon and String (en-US) for Highlighted Diff Navigation * Added Preference and ToggleButton for diff navigation style
56 lines
1.6 KiB
C#
56 lines
1.6 KiB
C#
using Avalonia.Controls;
|
|
using Avalonia.Interactivity;
|
|
using Avalonia.VisualTree;
|
|
|
|
namespace SourceGit.Views
|
|
{
|
|
public partial class DiffView : UserControl
|
|
{
|
|
public DiffView()
|
|
{
|
|
InitializeComponent();
|
|
}
|
|
|
|
private void OnGotoPrevChange(object _, RoutedEventArgs e)
|
|
{
|
|
if (ViewModels.Preference.Instance.EnableChangeBlocks)
|
|
{
|
|
if (DataContext is ViewModels.DiffContext diffCtx)
|
|
diffCtx.PrevChange();
|
|
}
|
|
else
|
|
{
|
|
var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
|
|
if (textDiff == null)
|
|
return;
|
|
|
|
textDiff.GotoPrevChange();
|
|
if (textDiff is SingleSideTextDiffPresenter presenter)
|
|
presenter.ForceSyncScrollOffset();
|
|
|
|
e.Handled = true;
|
|
}
|
|
}
|
|
|
|
private void OnGotoNextChange(object _, RoutedEventArgs e)
|
|
{
|
|
if (ViewModels.Preference.Instance.EnableChangeBlocks)
|
|
{
|
|
if (DataContext is ViewModels.DiffContext diffCtx)
|
|
diffCtx.NextChange();
|
|
}
|
|
else
|
|
{
|
|
var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
|
|
if (textDiff == null)
|
|
return;
|
|
|
|
textDiff.GotoNextChange();
|
|
if (textDiff is SingleSideTextDiffPresenter presenter)
|
|
presenter.ForceSyncScrollOffset();
|
|
|
|
e.Handled = true;
|
|
}
|
|
}
|
|
}
|
|
}
|