diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 12 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | include/Scintilla.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 1 | ||||
| -rw-r--r-- | src/Indicator.cxx | 3 |
5 files changed, 20 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index ed66afa69..dc9c006cf 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -4101,7 +4101,17 @@ struct Sci_TextToFind { <td>A 2-pixel thick underline located at the bottom of the line to try to avoid touching the character base. Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated. - This is similar to an appearance used for Asian language input composition.</td> + This is similar to an appearance used for the target in Asian language input composition.</td> + </tr> + + <tr> + <td align="left"><code>INDIC_COMPOSITIONTHIN</code></td> + + <td align="center">15</td> + + <td>A 1-pixel thick underline located just before the bottom of the line. + Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated. + This is similar to an appearance used for non-target ranges in Asian language input composition.</td> </tr> </tbody> diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 9fe18dcf6..ea7cce1fa 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -489,6 +489,10 @@ Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'. <a href="http://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>. </li> + <li> + Add new indicator INDIC_COMPOSITIONTHIN to mimic the appearance of non-target segments + in OS X IME. + </li> </ul> <h3> <a href="http://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a> diff --git a/include/Scintilla.h b/include/Scintilla.h index deaede845..e4625356b 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -274,6 +274,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define INDIC_DOTBOX 12 #define INDIC_SQUIGGLEPIXMAP 13 #define INDIC_COMPOSITIONTHICK 14 +#define INDIC_COMPOSITIONTHIN 15 #define INDIC_IME 32 #define INDIC_IME_MAX 35 #define INDIC_MAX 35 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 3ad92994a..fe0b66454 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -605,6 +605,7 @@ val INDIC_SQUIGGLELOW=11 val INDIC_DOTBOX=12 val INDIC_SQUIGGLEPIXMAP=13 val INDIC_COMPOSITIONTHICK=14 +val INDIC_COMPOSITIONTHIN=15 val INDIC_IME=32 val INDIC_IME_MAX=35 val INDIC_MAX=35 diff --git a/src/Indicator.cxx b/src/Indicator.cxx index d8ad64ed6..daf62aa02 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -155,6 +155,9 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r } else if (style == INDIC_COMPOSITIONTHICK) { PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom); surface->FillRectangle(rcComposition, fore); + } else if (style == INDIC_COMPOSITIONTHIN) { + PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom-1); + surface->FillRectangle(rcComposition, fore); } else { // Either INDIC_PLAIN or unknown surface->MoveTo(static_cast<int>(rc.left), ymid); surface->LineTo(static_cast<int>(rc.right), ymid); |