Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 10:45:39 +03:00
Code Issues Projects Releases Wiki Activity

Also show full file conflict solving buttons when there's no hunks (happens with binary files)

Browse Source
This commit is contained in:
kas 2022-09-23 13:30:09 +02:00
parent 722f1b0506
commit 9119d41c25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/DiffView/FileWidget.cpp
View File

@ -200,10 +200,10 @@ void _FileWidget::Header::updatePatch(const git::Patch &patch) {
mEdit->updatePatch(patch, -1);
auto isConflicted = patch.isConflicted();
auto hasMultipleHunks = patch.count() > 1;
auto hasOneHunk = patch.count() == 1;
mOurs->setVisible(isConflicted && hasMultipleHunks);
mTheirs->setVisible(isConflicted && hasMultipleHunks);
mOurs->setVisible(isConflicted && !hasOneHunk);
mTheirs->setVisible(isConflicted && !hasOneHunk);
mSave->setVisible(mResolution != git::Patch::ConflictResolution::Unresolved);
mUndo->setVisible(mResolution != git::Patch::ConflictResolution::Unresolved);