From 91a0a5c9be59308be001bbc89c0aead0f3602494 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 14 May 2021 13:33:11 +1000
Subject: Add SCI_MARKERSETLAYER to define layer on which to draw content area
 markers. This replaces the use of SC_ALPHA_NOALPHA for markers.

---
 src/ViewStyle.cxx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/ViewStyle.cxx')

diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 60334c2ea..455a44c1e 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -483,7 +483,7 @@ std::optional<ColourAlpha> ViewStyle::Background(int marksOfLine, bool caretActi
 		int marks = marksOfLine;
 		for (int markBit = 0; (markBit < 32) && marks; markBit++) {
 			if ((marks & 1) && (markers[markBit].markType == SC_MARK_BACKGROUND) &&
-				(markers[markBit].alpha == SC_ALPHA_NOALPHA)) {
+				(markers[markBit].layer == Layer::base)) {
 				background = markers[markBit].back;
 			}
 			marks >>= 1;
@@ -494,14 +494,18 @@ std::optional<ColourAlpha> ViewStyle::Background(int marksOfLine, bool caretActi
 		if (marksMasked) {
 			for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) {
 				if ((marksMasked & 1) &&
-					(markers[markBit].alpha == SC_ALPHA_NOALPHA)) {
+					(markers[markBit].layer == Layer::base)) {
 					background = markers[markBit].back;
 				}
 				marksMasked >>= 1;
 			}
 		}
 	}
-	return background;
+	if (background) {
+		return background->Opaque();
+	} else {
+		return {};
+	}
 }
 
 bool ViewStyle::SelectionBackgroundDrawn() const noexcept {
-- 
cgit v1.2.3