diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2018-04-20 11:40:07 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2018-04-20 11:40:07 +1000 |
| commit | 24ebee4c40fff56602bd786d0c1291041a05a6f9 (patch) | |
| tree | 8fa9c4f1ca3e0db1f280f14ba89376b3e7fc1734 /src/Indicator.cxx | |
| parent | 9f0aa483ef535c34fb0bb627c71ae99f750b96e9 (diff) | |
| download | scintilla-mirror-24ebee4c40fff56602bd786d0c1291041a05a6f9.tar.gz | |
Undo part of last change as Xcode Clang doesn't like assigning long to int without cast.
Diffstat (limited to 'src/Indicator.cxx')
| -rw-r--r-- | src/Indicator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Indicator.cxx b/src/Indicator.cxx index eff9b558e..077d12740 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -23,8 +23,8 @@ using namespace Scintilla; static PRectangle PixelGridAlign(const PRectangle &rc) { // Move left and right side to nearest pixel to avoid blurry visuals - return PRectangle::FromInts(lround(rc.left), static_cast<int>(rc.top), - lround(rc.right), static_cast<int>(rc.bottom)); + return PRectangle::FromInts(static_cast<int>(lround(rc.left)), static_cast<int>(rc.top), + static_cast<int>(lround(rc.right)), static_cast<int>(rc.bottom)); } void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, DrawState drawState, int value) const { @@ -38,8 +38,8 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r surface->PenColour(sacDraw.fore); const int ymid = static_cast<int>(rc.bottom + rc.top) / 2; if (sacDraw.style == INDIC_SQUIGGLE) { - int x = lround(rc.left); - const int xLast = lround(rc.right); + int x = static_cast<int>(lround(rc.left)); + const int xLast = static_cast<int>(lround(rc.right)); int y = 0; surface->MoveTo(x, static_cast<int>(rc.top) + y); while (x < xLast) { @@ -177,7 +177,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r if (rcCharacter.Width() >= 0.1) { const int pixelHeight = static_cast<int>(rc.Height() - 1.0f); // 1 pixel onto next line if multiphase const XYPOSITION x = (sacDraw.style == INDIC_POINT) ? (rcCharacter.left) : ((rcCharacter.right + rcCharacter.left) / 2); - const int ix = lround(x); + const int ix = static_cast<int>(lround(x)); const int iy = static_cast<int>(rc.top + 1.0f); Point pts[] = { Point::FromInts(ix - pixelHeight, iy + pixelHeight), // Left |