Change 5549

samwise (Sam Stafford)
Sam Stafford committed this change into //guest/sam_stafford/calamari
Request Review
Download .zip
Fix another edge case bug where Qt's behavior is the opposite of what
I'd expect - when an empty clip region is set, the clip region is
cleared entirely, as if a FULL clip region had been set.  The resulting
bug was that any image which had zero conflicts would show up as one
gigantic conflict - ack!  The code now checks for this case and bails
out of any painting operation that's about to use an empty clip region.
  • Files 4
  • Comments 0
4 edited 0 added 0 deleted
MergeEditor.cpp#7
Loading...
MergeWidget.cpp#8
Loading...
Version#5
Loading...
calamari.vcproj#15
Loading...
Tip: Use n and p to cycle through the changes.