diff options
| author | nyamatongwe <devnull@localhost> | 2010-11-05 19:41:02 +1100 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-11-05 19:41:02 +1100 |
| commit | 582553de962c49e01f595136906b5e9d14914ba1 (patch) | |
| tree | 5143afab420c12881773b8df9eb3d8f3f750da14 /src | |
| parent | db26221bb09b7bbbbc48f452803d7b8252a301e0 (diff) | |
| download | scintilla-mirror-582553de962c49e01f595136906b5e9d14914ba1.tar.gz | |
Change fold markers to connect better with Cairo drawing that
avoids last pixel with LineTo.
Changed RectangleDraw and Ellipse to align better with lines
and so match fold markers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/LineMarker.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/LineMarker.cxx b/src/LineMarker.cxx index 41efe48ca..925bf5eb6 100644 --- a/src/LineMarker.cxx +++ b/src/LineMarker.cxx @@ -161,7 +161,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac } else if (markType == SC_MARK_VLINE) { surface->PenColour(back.allocated); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); } else if (markType == SC_MARK_LCORNER) { surface->PenColour(back.allocated); @@ -172,7 +172,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac } else if (markType == SC_MARK_TCORNER) { surface->PenColour(back.allocated); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rc.top + dimOn2); surface->LineTo(rc.right - 2, rc.top + dimOn2); @@ -186,7 +186,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac } else if (markType == SC_MARK_TCORNERCURVE) { surface->PenColour(back.allocated); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rc.top + dimOn2-3); surface->LineTo(centreX+3, rc.top + dimOn2); @@ -203,10 +203,10 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawPlus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, centreY - blobSize); + surface->LineTo(centreX, centreY - blobSize + 1); } else if (markType == SC_MARK_BOXMINUS) { surface->PenColour(back.allocated); @@ -214,7 +214,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawMinus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); } else if (markType == SC_MARK_BOXMINUSCONNECTED) { surface->PenColour(back.allocated); @@ -222,10 +222,10 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawMinus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, centreY - blobSize); + surface->LineTo(centreX, centreY - blobSize + 1); } else if (markType == SC_MARK_CIRCLEPLUS) { DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated); @@ -238,10 +238,10 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawPlus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, centreY - blobSize); + surface->LineTo(centreX, centreY - blobSize + 1); } else if (markType == SC_MARK_CIRCLEMINUS) { DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated); @@ -249,7 +249,7 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawMinus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); } else if (markType == SC_MARK_CIRCLEMINUSCONNECTED) { DrawCircle(surface, centreX, centreY, blobSize, fore.allocated, back.allocated); @@ -257,10 +257,10 @@ void LineMarker::Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharac DrawMinus(surface, centreX, centreY, blobSize, back.allocated); surface->MoveTo(centreX, centreY + blobSize); - surface->LineTo(centreX, rcWhole.bottom); + surface->LineTo(centreX, rcWhole.bottom + 1); surface->MoveTo(centreX, rcWhole.top); - surface->LineTo(centreX, centreY - blobSize); + surface->LineTo(centreX, centreY - blobSize + 1); } else if (markType >= SC_MARK_CHARACTER) { char character[1]; |