diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 4 | ||||
| -rw-r--r-- | include/Scintilla.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 5 | ||||
| -rw-r--r-- | src/Editor.cxx | 3 | ||||
| -rw-r--r-- | test/simpleTests.py | 5 |
5 files changed, 16 insertions, 2 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index e91f8ec3b..b9f15e267 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -6012,6 +6012,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ <a class="message" href="#SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(int line)</a><br /> <a class="message" href="#SCI_TOGGLEFOLDSHOWTEXT">SCI_TOGGLEFOLDSHOWTEXT(int line, const char *text)</a><br /> <a class="message" href="#SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</a><br /> + <a class="message" href="#SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE → int</a><br /> <a class="message" href="#SCI_FOLDLINE">SCI_FOLDLINE(int line, int action)</a><br /> <a class="message" href="#SCI_FOLDCHILDREN">SCI_FOLDCHILDREN(int line, int action)</a><br /> <a class="message" href="#SCI_FOLDALL">SCI_FOLDALL(int action)</a><br /> @@ -6175,7 +6176,8 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){ <code><a class="message" href="#StyleDefinition">STYLE_FOLDDISPLAYTEXT</a></code> style.</p> <p><b id="SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</b><br /> - This message changes the appearance of fold text tags.</p> + <b id="SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE → int</b><br /> + These message changes the appearance of fold text tags.</p> <table class="standard" summary="Fold flags"> <tbody> <tr> diff --git a/include/Scintilla.h b/include/Scintilla.h index c8ef2fa37..6187bc612 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -492,6 +492,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_FOLDDISPLAYTEXT_STANDARD 1 #define SC_FOLDDISPLAYTEXT_BOXED 2 #define SCI_FOLDDISPLAYTEXTSETSTYLE 2701 +#define SCI_FOLDDISPLAYTEXTGETSTYLE 2707 #define SC_FOLDACTION_CONTRACT 0 #define SC_FOLDACTION_EXPAND 1 #define SC_FOLDACTION_TOGGLE 2 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index cf2d01abc..2b69adef3 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1233,9 +1233,12 @@ val SC_FOLDDISPLAYTEXT_HIDDEN=0 val SC_FOLDDISPLAYTEXT_STANDARD=1 val SC_FOLDDISPLAYTEXT_BOXED=2 -# Set the style of fold display text +# Set the style of fold display text. set void FoldDisplayTextSetStyle=2701(int style,) +# Get the style of fold display text. +get int FoldDisplayTextGetStyle=2707(,) + enu FoldAction=SC_FOLDACTION_ val SC_FOLDACTION_CONTRACT=0 val SC_FOLDACTION_EXPAND=1 diff --git a/src/Editor.cxx b/src/Editor.cxx index 4bae9b44f..f269326a2 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -7201,6 +7201,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { Redraw(); break; + case SCI_FOLDDISPLAYTEXTGETSTYLE: + return foldDisplayTextStyle; + case SCI_TOGGLEFOLD: FoldLine(static_cast<Sci::Line>(wParam), SC_FOLDACTION_TOGGLE); break; diff --git a/test/simpleTests.py b/test/simpleTests.py index 3af25247c..b5260c8a8 100644 --- a/test/simpleTests.py +++ b/test/simpleTests.py @@ -1634,6 +1634,11 @@ class TestStyleAttributes(unittest.TestCase): self.ed.StyleSetHotSpot(self.ed.STYLE_DEFAULT, 1) self.assertEquals(self.ed.StyleGetHotSpot(self.ed.STYLE_DEFAULT), 1) + def testFoldDisplayTextStyle(self): + self.assertEquals(self.ed.FoldDisplayTextGetStyle(), 0) + self.ed.FoldDisplayTextSetStyle(self.ed.SC_FOLDDISPLAYTEXT_BOXED) + self.assertEquals(self.ed.FoldDisplayTextGetStyle(), self.ed.SC_FOLDDISPLAYTEXT_BOXED) + class TestIndices(unittest.TestCase): def setUp(self): self.xite = Xite.xiteFrame |