diff options
| author | nyamatongwe <devnull@localhost> | 2007-05-27 01:03:39 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2007-05-27 01:03:39 +0000 |
| commit | a7e855733d2a655fede13da970590703e170c629 (patch) | |
| tree | e28a5b8fceb2cf69b81cfa1e08553ce6a2fa87d0 | |
| parent | 907a49531ddf0eeafb25947a9fefd61b1e31b2f9 (diff) | |
| download | scintilla-mirror-a7e855733d2a655fede13da970590703e170c629.tar.gz | |
Patch from Todd Whiteman to show brace highlight background over
caret line background.
| -rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 368d4cd79..cbd129a87 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -235,6 +235,7 @@ <li>Istvan Szollosi</li> <li>Xie Renhui</li> <li>Enrico Tröger</li> + <li>Todd Whiteman</li> </ul> <p> Images used in GTK+ version diff --git a/src/Editor.cxx b/src/Editor.cxx index 8a2000090..acea1f463 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2176,7 +2176,7 @@ ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackgroun return vsDraw.edgecolour.allocated; if (inHotspot && vsDraw.hotspotBackgroundSet) return vsDraw.hotspotBackground.allocated; - if (overrideBackground) + if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD)) return background; } return vsDraw.styles[styleMain].back.allocated; |