# HG changeset patch # User Neil # Date 1490962049 -39600 # Node ID c105254dae66064fe4898cc13f409c7abfc1edab # Parent 284cc3b0e7544e9894323fd07e038fdec383b836 Hide decorations details a little. diff -r 284cc3b0e754 -r c105254dae66 cocoa/ScintillaCocoa.mm --- a/cocoa/ScintillaCocoa.mm Fri Mar 31 19:56:41 2017 +1100 +++ b/cocoa/ScintillaCocoa.mm Fri Mar 31 23:07:29 2017 +1100 @@ -2394,7 +2394,7 @@ void ScintillaCocoa::CompositionCommit() { pdoc->TentativeCommit(); - pdoc->decorations.SetCurrentIndicator(INDIC_IME); + pdoc->DecorationSetCurrentIndicator(INDIC_IME); pdoc->DecorationFillRange(0, 0, pdoc->Length()); } diff -r 284cc3b0e754 -r c105254dae66 gtk/ScintillaGTK.cxx --- a/gtk/ScintillaGTK.cxx Fri Mar 31 19:56:41 2017 +1100 +++ b/gtk/ScintillaGTK.cxx Fri Mar 31 23:07:29 2017 +1100 @@ -2227,7 +2227,7 @@ if (indicator < 8 || indicator > INDIC_MAX) { return; } - pdoc->decorations.SetCurrentIndicator(indicator); + pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; rDecorationFillRange(positionInsert - len, 1, len); diff -r 284cc3b0e754 -r c105254dae66 qt/ScintillaEditBase/ScintillaEditBase.cpp --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp Fri Mar 31 19:56:41 2017 +1100 +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp Fri Mar 31 23:07:29 2017 +1100 @@ -451,7 +451,7 @@ if (indicator < 8 || indicator > INDIC_MAX) { return; } - sqt->pdoc->decorations.SetCurrentIndicator(indicator); + sqt->pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; r< sqt-> sel.Count(); r++) { int positionInsert = sqt->sel.Range(r).Start().Position(); sqt->pdoc->DecorationFillRange(positionInsert - len, 1, len); diff -r 284cc3b0e754 -r c105254dae66 src/Document.cxx --- a/src/Document.cxx Fri Mar 31 19:56:41 2017 +1100 +++ b/src/Document.cxx Fri Mar 31 23:07:29 2017 +1100 @@ -2221,6 +2221,10 @@ styleClock = (styleClock + 1) % 0x100000; } +void SCI_METHOD Document::DecorationSetCurrentIndicator(int indicator) { + decorations.SetCurrentIndicator(indicator); +} + void SCI_METHOD Document::DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) { if (decorations.FillRange(position, value, fillLength)) { DocModification mh(SC_MOD_CHANGEINDICATOR | SC_PERFORMED_USER, diff -r 284cc3b0e754 -r c105254dae66 src/Document.h --- a/src/Document.h Fri Mar 31 19:56:41 2017 +1100 +++ b/src/Document.h Fri Mar 31 23:07:29 2017 +1100 @@ -410,9 +410,7 @@ void LexerChanged(); int GetStyleClock() const { return styleClock; } void IncrementStyleClock(); - void SCI_METHOD DecorationSetCurrentIndicator(int indicator) { - decorations.SetCurrentIndicator(indicator); - } + void SCI_METHOD DecorationSetCurrentIndicator(int indicator); void SCI_METHOD DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength); int SCI_METHOD SetLineState(Sci_Position line, int state); diff -r 284cc3b0e754 -r c105254dae66 src/Editor.cxx --- a/src/Editor.cxx Fri Mar 31 19:56:41 2017 +1100 +++ b/src/Editor.cxx Fri Mar 31 23:07:29 2017 +1100 @@ -7354,7 +7354,7 @@ return (wParam <= INDIC_MAX) ? vs.indicators[wParam].outlineAlpha : 0; case SCI_SETINDICATORCURRENT: - pdoc->decorations.SetCurrentIndicator(static_cast(wParam)); + pdoc->DecorationSetCurrentIndicator(static_cast(wParam)); break; case SCI_GETINDICATORCURRENT: return pdoc->decorations.GetCurrentIndicator(); diff -r 284cc3b0e754 -r c105254dae66 win32/ScintillaWin.cxx --- a/win32/ScintillaWin.cxx Fri Mar 31 19:56:41 2017 +1100 +++ b/win32/ScintillaWin.cxx Fri Mar 31 23:07:29 2017 +1100 @@ -906,7 +906,7 @@ if (indicator < 8 || indicator > INDIC_MAX) { return; } - pdoc->decorations.SetCurrentIndicator(indicator); + pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; rDecorationFillRange(positionInsert - len, 1, len);