Use filled rectangle for folder marker, light blue (or gray) color fo…

…r folder line.
zufuliu · Nov 6, 2018 · c26529b · c26529b
1 parent 0f32f31
commit c26529b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx
@@ -2105,7 +2105,7 @@ static void DrawFoldLines(Surface *surface, const EditModel &model, const ViewSt
 			PRectangle rcFoldLine = rcLine;
 			rcFoldLine.bottom = rcFoldLine.top + 1;
 			//surface->FillRectangle(rcFoldLine, vsDraw.styles[STYLE_DEFAULT].fore);
-			surface->FillRectangle(rcFoldLine, vsDraw.markers[SC_MARKNUM_FOLDER].back);
+			surface->FillRectangle(rcFoldLine, vsDraw.markers[SC_MARKNUM_FOLDER].fore);
 		}
 		// Paint the line below the fold
 		if ((expanded && (model.foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED))
@@ -2114,7 +2114,7 @@ static void DrawFoldLines(Surface *surface, const EditModel &model, const ViewSt
 			PRectangle rcFoldLine = rcLine;
 			rcFoldLine.top = rcFoldLine.bottom - 1;
 			//surface->FillRectangle(rcFoldLine, vsDraw.styles[STYLE_DEFAULT].fore);
-			surface->FillRectangle(rcFoldLine, vsDraw.markers[SC_MARKNUM_FOLDER].back);
+			surface->FillRectangle(rcFoldLine, vsDraw.markers[SC_MARKNUM_FOLDER].fore);
 		}
 	}
 }

diff --git a/src/Styles.c b/src/Styles.c
@@ -1017,13 +1017,18 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew) {
 		if (clrFore == 0x7F7F7F) {
 			clrFore = 0x808080;
 		}
+		const COLORREF clrFill = RGB(0xD3, 0xD3, 0xD3);
 #else	// use blue fold color
 		const COLORREF clrFore = RGB(0x80, 0x80, 0xFF);
+		const COLORREF clrFill = RGB(0xAD, 0xD8, 0xE6);
 #endif
 		for (unsigned int i = 0; i < COUNTOF(iMarkerIDs); ++i) {
-			SciCall_MarkerSetBack(iMarkerIDs[i], clrFore);
-			SciCall_MarkerSetFore(iMarkerIDs[i], clrBack);
+			const int marker = iMarkerIDs[i];
+			SciCall_MarkerSetBack(marker, clrFore);
+			SciCall_MarkerSetFore(marker, clrBack);
 		}
+		SciCall_MarkerSetFore(SC_MARKNUM_FOLDER, clrFill);
+		SciCall_MarkerSetFore(SC_MARKNUM_FOLDEREND, clrFill);
 	} // end set folding style
 
 	if (SendMessage(hwnd, SCI_GETINDENTATIONGUIDES, 0, 0) != SC_IV_NONE) {