github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/13616/head
ozone10 2023-04-25 17:57:46 +02:00 committed by Don Ho
parent 6b194453b8
commit 2d5c241e2b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -2808,12 +2808,22 @@ void ScintillaEditView::performGlobalStyles()
execute(SCI_SETMARGINTYPEN, _SC_MARGE_SYMBOL, SC_MARGIN_COLOUR); execute(SCI_SETMARGINTYPEN, _SC_MARGE_SYMBOL, SC_MARGIN_COLOUR);
execute(SCI_SETMARGINBACKN, _SC_MARGE_SYMBOL, bookmarkMarginColor); execute(SCI_SETMARGINBACKN, _SC_MARGE_SYMBOL, bookmarkMarginColor);
COLORREF changeHistoryMarginColor = veryLiteGrey;
pStyle = stylers.findByName(TEXT("Change History margin")); pStyle = stylers.findByName(TEXT("Change History margin"));
if (pStyle) if (!pStyle)
{ {
execute(SCI_SETMARGINTYPEN, _SC_MARGE_CHANGEHISTORY, SC_MARGIN_COLOUR); pStyle = stylers.findByName(TEXT("Line number margin"));
execute(SCI_SETMARGINBACKN, _SC_MARGE_CHANGEHISTORY, pStyle->_bgColor); 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; COLORREF urlHoveredFG = grey;
pStyle = stylers.findByName(TEXT("URL hovered")); pStyle = stylers.findByName(TEXT("URL hovered"));