Mercurial > hg > easyhg
comparison src/changesetitem.cpp @ 672:88fa1544b407
Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5
author | Chris Cannam |
---|---|
date | Wed, 05 Dec 2018 09:44:10 +0000 |
parents | ce29dc775650 |
children | c0b46d0514a7 751b21af6b6f |
comparison
equal
deleted
inserted
replaced
665:88061103b878 | 672:88fa1544b407 |
---|---|
511 int ps = int((f.pixelSize() / scale) + 0.5); | 511 int ps = int((f.pixelSize() / scale) + 0.5); |
512 if (ps < 8) ps = 8; | 512 if (ps < 8) ps = 8; |
513 f.setPixelSize(ps); | 513 f.setPixelSize(ps); |
514 } | 514 } |
515 | 515 |
516 bool showText = (scale >= 0.2); | |
517 bool showProperLines = (scale >= 0.1); | 516 bool showProperLines = (scale >= 0.1); |
518 | 517 |
519 if (!showProperLines) { | 518 if (!showProperLines) { |
520 paint->setPen(QPen(branchColour, 0)); | 519 paint->setPen(QPen(branchColour, 0)); |
521 } else { | 520 } else { |