dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-20 19:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: text diff view block navigation

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-21 17:35:59 +08:00
parent 39f4cd1732
commit 03f49ccff0
No known key found for this signature in database
3 changed files with 77 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

138
src/Views/TextDiffView.axaml.cs
View file

@ -553,7 +553,7 @@ namespace SourceGit.Views
{
}
public void GotoFirstChange()
public virtual void GotoFirstChange()
{
var blockNavigation = BlockNavigation;
if (blockNavigation != null)
@ -567,7 +567,7 @@ namespace SourceGit.Views
}
}
public void GotoPrevChange()
public virtual void GotoPrevChange()
{
var blockNavigation = BlockNavigation;
if (blockNavigation != null)
@ -623,7 +623,7 @@ namespace SourceGit.Views
}
}
public void GotoNextChange()
public virtual void GotoNextChange()
{
var blockNavigation = BlockNavigation;
if (blockNavigation != null)
@ -665,7 +665,7 @@ namespace SourceGit.Views
}
}
public void GotoLastChange()
public virtual void GotoLastChange()
{
var blockNavigation = BlockNavigation;
if (blockNavigation != null)
@ -766,15 +766,13 @@ namespace SourceGit.Views
{
var oldValue = change.OldValue as ViewModels.BlockNavigation;
if (oldValue != null)
{
oldValue.PropertyChanged -= OnBlockNavigationPropertyChanged;
if (oldValue.Current != -1)
TextArea?.TextView?.Redraw();
}
var newValue = change.NewValue as ViewModels.BlockNavigation;
if (newValue != null)
newValue.PropertyChanged += OnBlockNavigationPropertyChanged;
TextArea?.TextView?.Redraw();
}
}
@ -793,9 +791,10 @@ namespace SourceGit.Views
base.OnKeyDown(e);
}
private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs _2)
private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs e)
{
TextArea?.TextView?.Redraw();
if (e.PropertyName == "Current")
TextArea?.TextView?.Redraw();
}
private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
@ -1223,19 +1222,18 @@ namespace SourceGit.Views
{
base.OnLoaded(e);
var scroller = this.FindDescendantOfType<ScrollViewer>();
if (scroller != null)
_scrollViewer = this.FindDescendantOfType<ScrollViewer>();
if (_scrollViewer != null)
{
scroller.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
scroller.ScrollChanged += OnTextViewScrollChanged;
_scrollViewer.Bind(ScrollViewer.OffsetProperty, new Binding("ScrollOffset", BindingMode.TwoWay));
_scrollViewer.ScrollChanged += OnTextViewScrollChanged;
}
}
protected override void OnUnloaded(RoutedEventArgs e)
{
var scroller = this.FindDescendantOfType<ScrollViewer>();
if (scroller != null)
scroller.ScrollChanged -= OnTextViewScrollChanged;
if (_scrollViewer != null)
_scrollViewer.ScrollChanged -= OnTextViewScrollChanged;
base.OnUnloaded(e);
}
@ -1274,9 +1272,11 @@ namespace SourceGit.Views
private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
{
if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller)
if (_scrollViewer is { IsExpanded: true, IsPointerOver: true })
TrySetChunk(null);
}
private ScrollViewer _scrollViewer = null;
}
public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
@ -1288,14 +1288,6 @@ namespace SourceGit.Views
TextArea.LeftMargins.Add(new LineModifyTypeMargin());
}
public void ForceSyncScrollOffset()
{
if (_scrollViewer == null)
return;
if (DataContext is ViewModels.TwoSideTextDiff diff)
diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
}
public override List<Models.TextDiffLine> GetLines()
{
if (DataContext is ViewModels.TwoSideTextDiff diff)
@ -1310,6 +1302,30 @@ namespace SourceGit.Views
return 0;
}
public override void GotoFirstChange()
{
base.GotoFirstChange();
DirectSyncScrollOffset();
}
public override void GotoPrevChange()
{
base.GotoPrevChange();
DirectSyncScrollOffset();
}
public override void GotoNextChange()
{
base.GotoNextChange();
DirectSyncScrollOffset();
}
public override void GotoLastChange()
{
base.GotoLastChange();
DirectSyncScrollOffset();
}
public override void UpdateSelectedChunk(double y)
{
var diff = DataContext as ViewModels.TwoSideTextDiff;
@ -1497,11 +1513,17 @@ namespace SourceGit.Views
{
diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
if (sender is ScrollViewer { IsExpanded: true, IsPointerOver: true } scroller )
if (_scrollViewer is { IsExpanded: true, IsPointerOver: true } )
TrySetChunk(null);
}
}
private void DirectSyncScrollOffset()
{
if (_scrollViewer is { } && DataContext is ViewModels.TwoSideTextDiff diff)
diff.SyncScrollOffset = _scrollViewer?.Offset ?? Vector.Zero;
}
private ScrollViewer _scrollViewer = null;
}
@ -1679,13 +1701,13 @@ namespace SourceGit.Views
set => SetValue(BlockNavigationProperty, value);
}
public static readonly StyledProperty<string> BlockNavigationIndicatorProperty =
AvaloniaProperty.Register<TextDiffView, string>(nameof(BlockNavigationIndicator));
public static readonly RoutedEvent<RoutedEventArgs> BlockNavigationChangedEvent =
RoutedEvent.Register<TextDiffView, RoutedEventArgs>(nameof(BlockNavigationChanged), RoutingStrategies.Tunnel | RoutingStrategies.Bubble);
public string BlockNavigationIndicator
public event EventHandler<RoutedEventArgs> BlockNavigationChanged
{
get => GetValue(BlockNavigationIndicatorProperty);
set => SetValue(BlockNavigationIndicatorProperty, value);
add { AddHandler(BlockNavigationChangedEvent, value); }
remove { RemoveHandler(BlockNavigationChangedEvent, value); }
}
static TextDiffView()
@ -1723,54 +1745,26 @@ namespace SourceGit.Views
public void GotoFirstChange()
{
var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return;
presenter.GotoFirstChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoFirstChange();
RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
}
public void GotoPrevChange()
{
var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return;
presenter.GotoPrevChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoPrevChange();
RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
}
public void GotoNextChange()
{
var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return;
presenter.GotoNextChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoNextChange();
RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
}
public void GotoLastChange()
{
var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
if (presenter == null)
return;
presenter.GotoLastChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
this.FindDescendantOfType<ThemedTextDiffPresenter>()?.GotoLastChange();
RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
}
protected override void OnDataContextChanged(EventArgs e)
@ -1820,15 +1814,11 @@ namespace SourceGit.Views
private void RefreshBlockNavigation()
{
if (UseBlockNavigation)
{
BlockNavigation = new ViewModels.BlockNavigation(Editor.Content);
BlockNavigationIndicator = BlockNavigation.Indicator;
}
else
{
BlockNavigation = null;
BlockNavigationIndicator = "-/-";
}
RaiseEvent(new RoutedEventArgs(BlockNavigationChangedEvent));
}
private void OnStageChunk(object _1, RoutedEventArgs _2)