Allow selected text foreground color to be changed

Fix #3397, fix #1314, close #9817
This commit is contained in:
Scott Sumner 2021-04-29 16:49:26 -04:00 committed by Don HO
parent 8339de66d2
commit 44b2bef69b
2 changed files with 14 additions and 12 deletions

View File

@ -2566,24 +2566,26 @@ void ScintillaEditView::performGlobalStyles()
execute(SCI_SETCARETLINEBACK, style._bgColor);
}
COLORREF selectColorBack = grey;
COLORREF selectColorBack = grey;
COLORREF selectColorFore = black;
i = stylers.getStylerIndexByName(TEXT("Selected text colour"));
if (i != -1)
{
Style & style = stylers.getStyler(i);
{
Style & style = stylers.getStyler(i);
selectColorBack = style._bgColor;
}
selectColorFore = style._fgColor;
}
execute(SCI_SETSELBACK, 1, selectColorBack);
execute(SCI_SETSELFORE, 1, selectColorFore);
COLORREF caretColor = black;
COLORREF caretColor = black;
i = stylers.getStylerIndexByID(SCI_SETCARETFORE);
if (i != -1)
{
Style & style = stylers.getStyler(i);
caretColor = style._fgColor;
}
execute(SCI_SETCARETFORE, caretColor);
{
Style & style = stylers.getStyler(i);
caretColor = style._fgColor;
}
execute(SCI_SETCARETFORE, caretColor);
COLORREF edgeColor = liteGrey;
i = stylers.getStylerIndexByName(TEXT("Edge colour"));

View File

@ -1377,7 +1377,7 @@
<WidgetStyle name="Brace highlight style" styleID="34" fgColor="FF0000" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="10" />
<WidgetStyle name="Bad brace colour" styleID="35" fgColor="800000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Current line background colour" styleID="0" bgColor="E8E8FF" />
<WidgetStyle name="Selected text colour" styleID="0" bgColor="C0C0C0" />
<WidgetStyle name="Selected text colour" styleID="0" bgColor="C0C0C0" fgColor="000000" />
<WidgetStyle name="Caret colour" styleID="2069" fgColor="8000FF" />
<WidgetStyle name="Edge colour" styleID="0" fgColor="80FFFF" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="808080" bgColor="E4E4E4" fontName="" fontStyle="0" fontSize="" />