diff options
| author | mitchell <unknown> | 2018-05-06 09:16:53 -0400 |
|---|---|---|
| committer | mitchell <unknown> | 2018-05-06 09:16:53 -0400 |
| commit | 91bdbe3b40b76e9ea822ee750b4ab543f4bb105d (patch) | |
| tree | 13ff976a6dd0cb0b43d8dae12319629856a215d4 /src/EditView.cxx | |
| parent | 74a34523f9c17cdca12143d31a578d8565b1922d (diff) | |
| download | scintilla-mirror-91bdbe3b40b76e9ea822ee750b4ab543f4bb105d.tar.gz | |
Backport: Feature [feature-requests:#1215]. Use standard functions in prference to RoundXYPosition, XYMinimum, and XYMaximum.
Backport of changeset 6713:fadc4c551b6d.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 7c400d535..ec7f8d4be 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1163,8 +1163,8 @@ void EditView::DrawFoldDisplayText(Surface *surface, const EditModel &model, con if (model.foldDisplayTextStyle == SC_FOLDDISPLAYTEXT_BOXED) { surface->PenColour(textFore); PRectangle rcBox = rcSegment; - rcBox.left = static_cast<XYPOSITION>(RoundXYPosition(rcSegment.left)); - rcBox.right = static_cast<XYPOSITION>(RoundXYPosition(rcSegment.right)); + rcBox.left = round(rcSegment.left); + rcBox.right = round(rcSegment.right); surface->MoveTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.top)); surface->LineTo(static_cast<int>(rcBox.left), static_cast<int>(rcBox.bottom)); surface->MoveTo(static_cast<int>(rcBox.right), static_cast<int>(rcBox.top)); @@ -1366,7 +1366,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt xposCaret += xStart; if (model.posDrag.IsValid()) { /* Dragging text, use a line caret */ - rcCaret.left = static_cast<XYPOSITION>(RoundXYPosition(xposCaret - caretWidthOffset)); + rcCaret.left = round(xposCaret - caretWidthOffset); rcCaret.right = rcCaret.left + vsDraw.caretWidth; } else if (model.inOverstrike && drawOverstrikeCaret) { /* Overstrike (insert mode), use a modified bar caret */ @@ -1384,7 +1384,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt } } else { /* Line caret */ - rcCaret.left = static_cast<XYPOSITION>(RoundXYPosition(xposCaret - caretWidthOffset)); + rcCaret.left = round(xposCaret - caretWidthOffset); rcCaret.right = rcCaret.left + vsDraw.caretWidth; } const ColourDesired caretColour = mainCaret ? vsDraw.caretcolour : vsDraw.additionalCaretColour; |