Revision: 4882 http://geany.svn.sourceforge.net/geany/?rev=4882&view=rev Author: eht16 Date: 2010-05-08 13:10:14 +0000 (Sat, 08 May 2010)
Log Message: ----------- Apply foreground and background colours of the folding margin style properly (closes #2998347).
Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-07 13:21:32 UTC (rev 4881) +++ trunk/ChangeLog 2010-05-08 13:10:14 UTC (rev 4882) @@ -1,3 +1,10 @@ +2010-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/highlighting.c: + Apply foreground and background colours of the folding margin + style properly (closes #2998347). + + 2010-05-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c:
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2010-05-07 13:21:32 UTC (rev 4881) +++ trunk/src/highlighting.c 2010-05-08 13:10:14 UTC (rev 4882) @@ -750,20 +750,34 @@ break; }
- SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, 0x000000); - SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); - SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground)); + SSM(sci, SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); + SSM(sci, SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, + invert(common_style_set.styling[GCS_MARGIN_FOLDING].foreground));
sci_set_property(sci, "fold", "1"); sci_set_property(sci, "fold.compact", "0"); @@ -781,8 +795,9 @@
SSM(sci, SCI_SETSTYLEBITS, SSM(sci, SCI_GETSTYLEBITSNEEDED, 0, 0), 0);
+ /* TODO maybe we want to split the colour and hicolour to allow more fine-grained control */ SSM(sci, SCI_SETFOLDMARGINCOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); - /*SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background));*/ + SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background)); set_sci_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_NONE, GCS_MARGIN_LINENUMBER); set_sci_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_NONE, GCS_BRACE_GOOD); set_sci_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_NONE, GCS_BRACE_BAD);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.