aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Decoration.cxx4
-rw-r--r--src/Editor.cxx36
-rw-r--r--src/ViewStyle.cxx4
3 files changed, 22 insertions, 22 deletions
diff --git a/src/Decoration.cxx b/src/Decoration.cxx
index 2094bca1a..91a2a6c6b 100644
--- a/src/Decoration.cxx
+++ b/src/Decoration.cxx
@@ -229,7 +229,7 @@ template <typename POS>
void DecorationList<POS>::DeleteLexerDecorations() {
decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
[](const std::unique_ptr<Decoration<POS>> &deco) {
- return deco->Indicator() < INDIC_CONTAINER;
+ return deco->Indicator() < INDICATOR_CONTAINER ;
}), decorationList.end());
current = nullptr;
SetView();
@@ -260,7 +260,7 @@ int DecorationList<POS>::AllOnFor(Sci::Position position) const {
int mask = 0;
for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
if (deco->rs.ValueAt(static_cast<POS>(position))) {
- if (deco->Indicator() < INDIC_IME) {
+ if (deco->Indicator() < INDICATOR_IME) {
mask |= 1 << deco->Indicator();
}
}
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 2f35862e8..497d92050 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -7357,7 +7357,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
break;
case SCI_INDICSETSTYLE:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].sacNormal.style = static_cast<int>(lParam);
vs.indicators[wParam].sacHover.style = static_cast<int>(lParam);
InvalidateStyleRedraw();
@@ -7365,10 +7365,10 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
break;
case SCI_INDICGETSTYLE:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].sacNormal.style : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].sacNormal.style : 0;
case SCI_INDICSETFORE:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].sacNormal.fore = ColourDesired(static_cast<int>(lParam));
vs.indicators[wParam].sacHover.fore = ColourDesired(static_cast<int>(lParam));
InvalidateStyleRedraw();
@@ -7376,67 +7376,67 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
break;
case SCI_INDICGETFORE:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].sacNormal.fore.AsInteger() : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].sacNormal.fore.AsInteger() : 0;
case SCI_INDICSETHOVERSTYLE:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].sacHover.style = static_cast<int>(lParam);
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETHOVERSTYLE:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].sacHover.style : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].sacHover.style : 0;
case SCI_INDICSETHOVERFORE:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].sacHover.fore = ColourDesired(static_cast<int>(lParam));
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETHOVERFORE:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].sacHover.fore.AsInteger() : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].sacHover.fore.AsInteger() : 0;
case SCI_INDICSETFLAGS:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].SetFlags(static_cast<int>(lParam));
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETFLAGS:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].Flags() : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].Flags() : 0;
case SCI_INDICSETUNDER:
- if (wParam <= INDIC_MAX) {
+ if (wParam <= INDICATOR_MAX) {
vs.indicators[wParam].under = lParam != 0;
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETUNDER:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].under : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].under : 0;
case SCI_INDICSETALPHA:
- if (wParam <= INDIC_MAX && lParam >=0 && lParam <= 255) {
+ if (wParam <= INDICATOR_MAX && lParam >=0 && lParam <= 255) {
vs.indicators[wParam].fillAlpha = static_cast<int>(lParam);
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETALPHA:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fillAlpha : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].fillAlpha : 0;
case SCI_INDICSETOUTLINEALPHA:
- if (wParam <= INDIC_MAX && lParam >=0 && lParam <= 255) {
+ if (wParam <= INDICATOR_MAX && lParam >=0 && lParam <= 255) {
vs.indicators[wParam].outlineAlpha = static_cast<int>(lParam);
InvalidateStyleRedraw();
}
break;
case SCI_INDICGETOUTLINEALPHA:
- return (wParam <= INDIC_MAX) ? vs.indicators[wParam].outlineAlpha : 0;
+ return (wParam <= INDICATOR_MAX) ? vs.indicators[wParam].outlineAlpha : 0;
case SCI_SETINDICATORCURRENT:
pdoc->DecorationSetCurrentIndicator(static_cast<int>(wParam));
@@ -7571,7 +7571,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
break;
case SCI_BRACEHIGHLIGHTINDICATOR:
- if (lParam >= 0 && lParam <= INDIC_MAX) {
+ if (lParam >= 0 && lParam <= INDICATOR_MAX) {
vs.braceHighlightIndicatorSet = wParam != 0;
vs.braceHighlightIndicator = static_cast<int>(lParam);
}
@@ -7582,7 +7582,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
break;
case SCI_BRACEBADLIGHTINDICATOR:
- if (lParam >= 0 && lParam <= INDIC_MAX) {
+ if (lParam >= 0 && lParam <= INDICATOR_MAX) {
vs.braceBadLightIndicatorSet = wParam != 0;
vs.braceBadLightIndicator = static_cast<int>(lParam);
}
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index cfd9701ae..6b24e15fb 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -56,13 +56,13 @@ void FontRealised::Realise(Surface &surface, int zoomLevel, int technology, cons
spaceWidth = surface.WidthText(font, " ");
}
-ViewStyle::ViewStyle() : markers(MARKER_MAX + 1), indicators(INDIC_MAX + 1) {
+ViewStyle::ViewStyle() : markers(MARKER_MAX + 1), indicators(INDICATOR_MAX + 1) {
Init();
}
// Copy constructor only called when printing copies the screen ViewStyle so it can be
// modified for printing styles.
-ViewStyle::ViewStyle(const ViewStyle &source) : markers(MARKER_MAX + 1), indicators(INDIC_MAX + 1) {
+ViewStyle::ViewStyle(const ViewStyle &source) : markers(MARKER_MAX + 1), indicators(INDICATOR_MAX + 1) {
Init(source.styles.size());
styles = source.styles;
for (size_t sty=0; sty<source.styles.size(); sty++) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 21:01:42 +0000