Commit 1212677

committed

Added indicator of current/total change-blocks in DiffView toolbar

1 parent adbeb78 commit 1212677Copy full SHA for 1212677

File tree

2 files changed

+31

-1

lines changed

src
- ViewModels
  - DiffContext.cs
- Views
  - DiffView.axaml

2 files changed

+31

-1

lines changed

`‎src/ViewModels/DiffContext.cs`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,12 @@ public int UnifiedLines`
`51`	`51`	`private set => SetProperty(ref _unifiedLines, value);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ public string ChangeBlockIndicator`
	`55`	`+ {`
	`56`	`+ get => _changeBlockIndicator;`
	`57`	`+ private set => SetProperty(ref _changeBlockIndicator, value);`
	`58`	`+ }`
	`59`	`+`
`54`	`60`	`public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)`
`55`	`61`	`{`
`56`	`62`	`_repo = repo;`
`@@ -88,6 +94,7 @@ public void PrevChange()`
`88`	`94`	`textDiff.CurrentChangeBlockIdx = 0;`
`89`	`95`	`}`
`90`	`96`	`}`
	`97`	`+ RefreshChangeBlockIndicator();`
`91`	`98`	`}`
`92`	`99`
`93`	`100`	`public void NextChange()`
`@@ -104,7 +111,20 @@ public void NextChange()`
`104`	`111`	`textDiff.CurrentChangeBlockIdx = -1;`
`105`	`112`	`textDiff.CurrentChangeBlockIdx = textDiff.ChangeBlocks.Count - 1;`
`106`	`113`	`}`
	`114`	`+ RefreshChangeBlockIndicator();`
	`115`	`+ }`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ public void RefreshChangeBlockIndicator()`
	`119`	`+ {`
	`120`	`+ string curr = "-", tot = "-";`
	`121`	`+ if (_content is Models.TextDiff textDiff)`
	`122`	`+ {`
	`123`	`+ if (textDiff.CurrentChangeBlockIdx >= 0)`
	`124`	`+ curr = (textDiff.CurrentChangeBlockIdx + 1).ToString();`
	`125`	`+ tot = (textDiff.ChangeBlocks.Count).ToString();`
`107`	`126`	`}`
	`127`	`+ ChangeBlockIndicator = curr + "/" + tot;`
`108`	`128`	`}`
`109`	`129`
`110`	`130`	`public void ToggleFullTextDiff()`
`@@ -251,7 +271,9 @@ private void LoadDiffContent()`
`251`	`271`	`FileModeChange = latest.FileModeChange;`
`252`	`272`	`Content = rs;`
`253`	`273`	`IsTextDiff = rs is Models.TextDiff;`
`254`		`- });`
	`274`	`+`
	`275`	`+ RefreshChangeBlockIndicator();`
	`276`	`+ });`
`255`	`277`	`});`
`256`	`278`	`}`
`257`	`279`
`@@ -315,6 +337,7 @@ public bool IsSame(Info other)`
`315`	`337`	`private string _title;`
`316`	`338`	`private string _fileModeChange = string.Empty;`
`317`	`339`	`private int _unifiedLines = 4;`
	`340`	`+ private string _changeBlockIndicator = "-/-";`
`318`	`341`	`private bool _isTextDiff = false;`
`319`	`342`	`private bool _ignoreWhitespace = false;`
`320`	`343`	`private object _content = null;`

`‎src/Views/DiffView.axaml`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,13 @@`
`42`	`42`	`<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>`
`43`	`43`	`</Button>`
`44`	`44`
	`45`	`+ <TextBlock Classes="primary"`
	`46`	`+ Margin="0,0,0,0"`
	`47`	`+ Text="{Binding ChangeBlockIndicator}"`
	`48`	`+ FontSize="11"`
	`49`	`+ TextTrimming="CharacterEllipsis"`
	`50`	`+ IsVisible="{Binding IsTextDiff}"/>`
	`51`	`+`
`45`	`52`	`<Button Classes="icon_button"`
`46`	`53`	`Width="28"`
`47`	`54`	`Click="OnGotoNextChange"`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1212677

File tree

2 files changed

2 files changed

`‎src/ViewModels/DiffContext.cs`

`‎src/Views/DiffView.axaml`

0 commit comments