diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-09-05 16:09:11 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-09-05 16:09:11 +1000 |
| commit | eee3ce336ae78e9bf3d75f2c84aba97a7c623ea4 (patch) | |
| tree | d6ed0161a5512119662752a77ef08ee7bfabfccd /lexers/LexCPP.cxx | |
| parent | a44d91e9c8ea286a024e06faa11381ee59ffc419 (diff) | |
| download | scintilla-mirror-eee3ce336ae78e9bf3d75f2c84aba97a7c623ea4.tar.gz | |
Bug [#1520]. Make SCI_GETSTYLEFROMSUBSTYLE work for secondary styles.
Diffstat (limited to 'lexers/LexCPP.cxx')
| -rw-r--r-- | lexers/LexCPP.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 5340271d5..70af0343f 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -388,7 +388,9 @@ public: return subStyles.Length(styleBase); } int SCI_METHOD StyleFromSubStyle(int subStyle) { - return subStyles.BaseStyle(subStyle); + int styleBase = subStyles.BaseStyle(MaskActive(subStyle)); + int active = subStyle & activeFlag; + return styleBase | active; } void SCI_METHOD FreeSubStyles() { subStyles.Free(); |