Check whether we should ignore current delta when moving to next/previous delta
| 482 | |
| 483 | // Check whether we should ignore current delta when moving to next/previous delta |
| 484 | bool MergeResultWindow::checkOverviewIgnore(const MergeBlockList::const_iterator i) const |
| 485 | { |
| 486 | if(mOverviewMode == e_OverviewMode::eOMNormal) return false; |
| 487 | if(mOverviewMode == e_OverviewMode::eOMAvsB) |
| 488 | return i->details() == e_MergeDetails::eCAdded || i->details() == e_MergeDetails::eCDeleted || i->details() == e_MergeDetails::eCChanged; |
| 489 | if(mOverviewMode == e_OverviewMode::eOMAvsC) |
| 490 | return i->details() == e_MergeDetails::eBAdded || i->details() == e_MergeDetails::eBDeleted || i->details() == e_MergeDetails::eBChanged; |
| 491 | if(mOverviewMode == e_OverviewMode::eOMBvsC) |
| 492 | return i->details() == e_MergeDetails::eBCAddedAndEqual || i->details() == e_MergeDetails::eBCDeleted || i->details() == e_MergeDetails::eBCChangedAndEqual; |
| 493 | return false; |
| 494 | } |
| 495 | |
| 496 | // Go to prev/next delta/conflict or first/last delta. |
| 497 | void MergeResultWindow::go(Direction eDir, EndPoint eEndPoint) |