From 477a158eb6d4bc035fe7bd5bfc477c7001dcc7dc Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 12 Mar 2024 15:12:33 +1100 Subject: Replace magic number 32 with defined MarkerMax (31), adjusting condition. --- src/EditView.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/EditView.cxx') diff --git a/src/EditView.cxx b/src/EditView.cxx index a4fd701a7..b3e024fe1 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1744,7 +1744,7 @@ void DrawEdgeLine(Surface *surface, const ViewStyle &vsDraw, const LineLayout *l void DrawMarkUnderline(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, Sci::Line line, PRectangle rcLine) { int marks = model.GetMark(line); - for (int markBit = 0; (markBit < 32) && marks; markBit++) { + for (int markBit = 0; (markBit <= MarkerMax) && marks; markBit++) { if ((marks & 1) && (vsDraw.markers[markBit].markType == MarkerSymbol::Underline) && (vsDraw.markers[markBit].layer == Layer::Base)) { PRectangle rcUnderline = rcLine; @@ -1864,7 +1864,7 @@ void DrawTranslucentLineState(Surface *surface, const EditModel &model, const Vi } const int marksOfLine = model.GetMark(line); int marksDrawnInText = marksOfLine & vsDraw.maskDrawInText; - for (int markBit = 0; (markBit < 32) && marksDrawnInText; markBit++) { + for (int markBit = 0; (markBit <= MarkerMax) && marksDrawnInText; markBit++) { if ((marksDrawnInText & 1) && (vsDraw.markers[markBit].layer == layer)) { if (vsDraw.markers[markBit].markType == MarkerSymbol::Background) { surface->FillRectangleAligned(rcLine, vsDraw.markers[markBit].BackWithAlpha()); @@ -1877,7 +1877,7 @@ void DrawTranslucentLineState(Surface *surface, const EditModel &model, const Vi marksDrawnInText >>= 1; } int marksDrawnInLine = marksOfLine & vsDraw.maskInLine; - for (int markBit = 0; (markBit < 32) && marksDrawnInLine; markBit++) { + for (int markBit = 0; (markBit <= MarkerMax) && marksDrawnInLine; markBit++) { if ((marksDrawnInLine & 1) && (vsDraw.markers[markBit].layer == layer)) { surface->FillRectangleAligned(rcLine, vsDraw.markers[markBit].BackWithAlpha()); } -- cgit v1.2.3