dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-07 20:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ux: show conflict description in change status icon
Some checks are pending
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details
Continuous Integration / Build (push) Waiting to run
Details

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-30 11:20:43 +08:00
parent f0c77ffeb8
commit 1bd2044589
No known key found for this signature in database
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Views/ChangeStatusIcon.cs
View file

@ -126,9 +126,16 @@ namespace SourceGit.Views
} }
if (isUnstaged) if (isUnstaged)
ToolTip.SetTip(this, TIPS[(int)c.WorkTree]); {
if (c.IsConflicted)
ToolTip.SetTip(this, $"Conflict ({c.ConflictDesc})");
else
ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
}
else else
{
ToolTip.SetTip(this, TIPS[(int)c.Index]); ToolTip.SetTip(this, TIPS[(int)c.Index]);
}
InvalidateVisual(); InvalidateVisual();
} }