aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMarko Njezic <devnull@localhost>2011-07-25 21:01:10 +0200
committerMarko Njezic <devnull@localhost>2011-07-25 21:01:10 +0200
commita3ece34153550f4de0f3dcb180b9bcf09530200a (patch)
treef93661c3c96dcff7c1c70ca03710d53778314ff5 /src
parent1c3158784674a3a5f87b82d08ed0f9e42122084a (diff)
downloadscintilla-mirror-a3ece34153550f4de0f3dcb180b9bcf09530200a.tar.gz
Properly override background color when using alpha blended selections.
Bug #3377116.
Diffstat (limited to 'src')
-rw-r--r--src/Editor.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index a94089e9f..452666be7 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -2391,10 +2391,12 @@ ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackgroun
return vsDraw.edgecolour.allocated;
if (inHotspot && vsDraw.hotspotBackgroundSet)
return vsDraw.hotspotBackground.allocated;
- if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD))
- return background;
}
- return vsDraw.styles[styleMain].back.allocated;
+ if (overrideBackground && (styleMain != STYLE_BRACELIGHT) && (styleMain != STYLE_BRACEBAD)) {
+ return background;
+ } else {
+ return vsDraw.styles[styleMain].back.allocated;
+ }
}
void Editor::DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight) {