From dc212d80cc3c37b291b07b9fe6f2fb6b4a9434ca Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 9 Oct 2022 09:58:21 +1100
Subject: Bug [#2358]. Suppress change history background line shading when
 printing.

---
 doc/ScintillaHistory.html | 4 ++++
 src/EditView.cxx          | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index be351123b..4a7898e22 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -608,6 +608,10 @@
 	Enlarge point and point top indicators and scale to be larger with larger text.
 	</li>
 	<li>
+	Suppress change history background line shading when printing.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2358/">Bug #2358</a>.
+	</li>
+	<li>
 	Make SCI_LINESCROLL more accurate when width of space not integer.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2357/">Bug #2357</a>.
 	</li>
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 8a7a50a7e..681541418 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -2808,6 +2808,14 @@ Sci::Position EditView::FormatRange(bool draw, CharacterRangeFull chrg, Rectangl
 		vsPrint.Refresh(*surfaceMeasure, model.pdoc->tabInChars);	// Recalculate fixedColumnWidth
 	}
 
+	// Turn off change history marker backgrounds
+	constexpr unsigned int changeMarkers =
+		1u << static_cast<unsigned int>(MarkerOutline::HistoryRevertedToOrigin) |
+		1u << static_cast<unsigned int>(MarkerOutline::HistorySaved) |
+		1u << static_cast<unsigned int>(MarkerOutline::HistoryModified) |
+		1u << static_cast<unsigned int>(MarkerOutline::HistoryRevertedToModified);
+	vsPrint.maskInLine &= ~changeMarkers;
+
 	const Sci::Line linePrintStart = model.pdoc->SciLineFromPosition(chrg.cpMin);
 	Sci::Line linePrintLast = linePrintStart + (rc.bottom - rc.top) / vsPrint.lineHeight - 1;
 	if (linePrintLast < linePrintStart)
-- 
cgit v1.2.3