From 86fc59c515f92eb9407e5f981eab1f4d04a6d97e Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 16 Jul 2020 09:16:44 +1000 Subject: Backport: Rename typeOfFold to FoldPart and make an enum class. Backport of changeset 8411:606b39f5e1f4. --- src/MarginView.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/MarginView.cxx') diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 9752371e1..f0a3559f4 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -431,25 +431,25 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, if (marks) { for (int markBit = 0; (markBit < 32) && marks; markBit++) { if (marks & 1) { - LineMarker::typeOfFold tFold = LineMarker::undefined; + LineMarker::FoldPart part = LineMarker::FoldPart::undefined; if ((vs.ms[margin].mask & SC_MASK_FOLDERS) && highlightDelimiter.IsFoldBlockHighlighted(lineDoc)) { if (highlightDelimiter.IsBodyOfFoldBlock(lineDoc)) { - tFold = LineMarker::body; + part = LineMarker::FoldPart::body; } else if (highlightDelimiter.IsHeadOfFoldBlock(lineDoc)) { if (firstSubLine) { - tFold = headWithTail ? LineMarker::headWithTail : LineMarker::head; + part = headWithTail ? LineMarker::FoldPart::headWithTail : LineMarker::FoldPart::head; } else { if (model.pcs->GetExpanded(lineDoc) || headWithTail) { - tFold = LineMarker::body; + part = LineMarker::FoldPart::body; } else { - tFold = LineMarker::undefined; + part = LineMarker::FoldPart::undefined; } } } else if (highlightDelimiter.IsTailOfFoldBlock(lineDoc)) { - tFold = LineMarker::tail; + part = LineMarker::FoldPart::tail; } } - vs.markers[markBit].Draw(surface, rcMarker, fontLineNumber, tFold, vs.ms[margin].style); + vs.markers[markBit].Draw(surface, rcMarker, fontLineNumber, part, vs.ms[margin].style); } marks >>= 1; } -- cgit v1.2.3