From 2d5c241e2bb570b5cb3dcf247c3e1ce86301f26f Mon Sep 17 00:00:00 2001 From: ozone10 Date: Tue, 25 Apr 2023 17:57:46 +0200 Subject: [PATCH] Fix Change history margin in black color issue Use Line number margin style color for Change history margin, if not defined in 'theme.xml'. Fix #12764, fix #13593, close #13594 --- .../src/ScintillaComponent/ScintillaEditView.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp index 5340a4e45..b521fc79c 100644 --- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp @@ -2808,12 +2808,22 @@ void ScintillaEditView::performGlobalStyles() execute(SCI_SETMARGINTYPEN, _SC_MARGE_SYMBOL, SC_MARGIN_COLOUR); execute(SCI_SETMARGINBACKN, _SC_MARGE_SYMBOL, bookmarkMarginColor); + COLORREF changeHistoryMarginColor = veryLiteGrey; pStyle = stylers.findByName(TEXT("Change History margin")); - if (pStyle) + if (!pStyle) { - execute(SCI_SETMARGINTYPEN, _SC_MARGE_CHANGEHISTORY, SC_MARGIN_COLOUR); - execute(SCI_SETMARGINBACKN, _SC_MARGE_CHANGEHISTORY, pStyle->_bgColor); + pStyle = stylers.findByName(TEXT("Line number margin")); + if (pStyle) + { + changeHistoryMarginColor = pStyle->_bgColor; + } } + else + { + changeHistoryMarginColor = pStyle->_bgColor; + } + execute(SCI_SETMARGINTYPEN, _SC_MARGE_CHANGEHISTORY, SC_MARGIN_COLOUR); + execute(SCI_SETMARGINBACKN, _SC_MARGE_CHANGEHISTORY, changeHistoryMarginColor); COLORREF urlHoveredFG = grey; pStyle = stylers.findByName(TEXT("URL hovered"));