From 5da0817ecb93ba62749b237ec61c90530f8af525 Mon Sep 17 00:00:00 2001
From: Scott Sumner <30118311+sasumner@users.noreply.github.com>
Date: Sat, 19 Sep 2020 16:51:07 -0400
Subject: [PATCH] Allow setting of background color for bookmark margin
Fix #8833, close #8874
---
.../src/ScitillaComponent/ScintillaEditView.cpp | 10 ++++++++++
PowerEditor/src/stylers.model.xml | 1 +
2 files changed, 11 insertions(+)
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index 569f7ae6b..d91f28967 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -2633,6 +2633,16 @@ void ScintillaEditView::performGlobalStyles()
execute(SCI_SETFOLDMARGINCOLOUR, true, foldMarginColor);
execute(SCI_SETFOLDMARGINHICOLOUR, true, foldMarginHiColor);
+ COLORREF bookmarkMarginColor = veryLiteGrey;
+ i = stylers.getStylerIndexByName(TEXT("Bookmark margin"));
+ if (i != -1)
+ {
+ Style & style = stylers.getStyler(i);
+ bookmarkMarginColor = style._bgColor;
+ }
+ execute(SCI_SETMARGINTYPEN, _SC_MARGE_SYBOLE, SC_MARGIN_COLOUR);
+ execute(SCI_SETMARGINBACKN, _SC_MARGE_SYBOLE, bookmarkMarginColor);
+
COLORREF urlHoveredFG = grey;
i = stylers.getStylerIndexByName(TEXT("URL hovered"));
if (i != -1)
diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml
index 5664360bd..5a623fae1 100644
--- a/PowerEditor/src/stylers.model.xml
+++ b/PowerEditor/src/stylers.model.xml
@@ -1379,6 +1379,7 @@
+