diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 13 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | include/Scintilla.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 1 | ||||
| -rw-r--r-- | src/Indicator.cxx | 11 |
5 files changed, 25 insertions, 2 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 447ec3979..84bbeb3af 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -79,7 +79,7 @@ <h1>Scintilla Documentation</h1> - <p>Last edited 13/June/2011 MNJ</p> + <p>Last edited 18/June/2011 NH</p> <p>There is <a class="jump" href="Design.html">an overview of the internal design of Scintilla</a>.<br /> @@ -3628,7 +3628,7 @@ struct Sci_TextToFind { <td align="center">1</td> - <td>A squiggly underline.</td> + <td>A squiggly underline. Requires 3 pixels of descender space.</td> </tr> <tr> @@ -3711,6 +3711,15 @@ struct Sci_TextToFind { <td>A dotted underline.</td> </tr> + <tr> + <td align="left"><code>INDIC_SQUIGGLELOW</code></td> + + <td align="center">11</td> + + <td>Similar to <code>INDIC_SQUIGGLE</code> but only using 2 vertical pixels + so will fit under small fonts.</td> + </tr> + </tbody> </table> diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index ce834a7fe..bba84d4ce 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -377,6 +377,7 @@ <td>Morten MacFly</td> </tr><tr> <td>Jaime Gimeno</td> + <td>Thomas Linder Puls</td> </tr> </table> <p> diff --git a/include/Scintilla.h b/include/Scintilla.h index e9620600c..308281d1b 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -250,6 +250,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define INDIC_STRAIGHTBOX 8 #define INDIC_DASH 9 #define INDIC_DOTS 10 +#define INDIC_SQUIGGLELOW 11 #define INDIC_MAX 31 #define INDIC_CONTAINER 8 #define INDIC0_MASK 0x20 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index cf6623280..d9272a1dc 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -553,6 +553,7 @@ val INDIC_ROUNDBOX=7 val INDIC_STRAIGHTBOX=8 val INDIC_DASH=9 val INDIC_DOTS=10 +val INDIC_SQUIGGLELOW=11 val INDIC_MAX=31 val INDIC_CONTAINER=8 val INDIC0_MASK=0x20 diff --git a/src/Indicator.cxx b/src/Indicator.cxx index c1d07b2e6..5efee75e6 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -27,6 +27,17 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r y = 2 - y; } surface->LineTo(rc.right, rc.top + y); // Finish the line + } else if (style == INDIC_SQUIGGLELOW) { + surface->MoveTo(rc.left, rc.top); + int x = rc.left + 3; + int y = 0; + while (x < rc.right) { + surface->LineTo(x-1, rc.top + y); + y = 1 - y; + surface->LineTo(x, rc.top + y); + x += 3; + } + surface->LineTo(rc.right, rc.top + y); // Finish the line } else if (style == INDIC_TT) { surface->MoveTo(rc.left, ymid); int x = rc.left + 5; |