HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1185 from b4n/error-indic-color

Browse Source 
Allow to configure the error indicator color
This commit is contained in:
Colomban Wendling 2016-10-29 15:15:43 +02:00
commit ae114e263c
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/filedefs/filetypes.common
View File

@ -93,6 +93,9 @@ line_height=0;0;
# 4th argument is true to override default background of calltips # 4th argument is true to override default background of calltips
calltips=call_tips calltips=call_tips
# error indicator color
indicator_error=0xff0000
[settings] [settings]
# which characters should be skipped when moving (or included when deleting) to word boundaries # which characters should be skipped when moving (or included when deleting) to word boundaries
# should always include space and tab (\s\t) # should always include space and tab (\s\t)

7
doc/geany.txt
View File

@ -4593,6 +4593,13 @@ calltips
*Example:* ``calltips=0xc0c0c0;0xffffff;false;false`` *Example:* ``calltips=0xc0c0c0;0xffffff;false;false``
indicator_error
The color of the error indicator.
Only the first argument (foreground color) is used.
*Example:* ``indicator_error=0xff0000``
[settings] section [settings] section
`````````````````` ``````````````````

5
src/highlighting.c
View File

@ -97,6 +97,7 @@ enum /* Geany common styling */
GCS_MARKER_TRANSLUCENCY, GCS_MARKER_TRANSLUCENCY,
GCS_LINE_HEIGHT, GCS_LINE_HEIGHT,
GCS_CALLTIPS, GCS_CALLTIPS,
GCS_INDICATOR_ERROR,
GCS_MAX GCS_MAX
}; };
@ -560,6 +561,7 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home)
get_keyfile_style(config, config_home, "marker_search", &common_style_set.styling[GCS_MARKER_SEARCH]); get_keyfile_style(config, config_home, "marker_search", &common_style_set.styling[GCS_MARKER_SEARCH]);
get_keyfile_style(config, config_home, "marker_mark", &common_style_set.styling[GCS_MARKER_MARK]); get_keyfile_style(config, config_home, "marker_mark", &common_style_set.styling[GCS_MARKER_MARK]);
get_keyfile_style(config, config_home, "calltips", &common_style_set.styling[GCS_CALLTIPS]); get_keyfile_style(config, config_home, "calltips", &common_style_set.styling[GCS_CALLTIPS]);
get_keyfile_style(config, config_home, "indicator_error", &common_style_set.styling[GCS_INDICATOR_ERROR]);
get_keyfile_ints(config, config_home, "styling", "folding_style", get_keyfile_ints(config, config_home, "styling", "folding_style",
1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines); 1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines);
@ -649,7 +651,8 @@ static void styleset_common(ScintillaObject *sci, guint ft_id)
/* Error indicator */ /* Error indicator */
SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLEPIXMAP); SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLEPIXMAP);
SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, invert(0x0000FF /* red, in BGR */)); SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR,
invert(common_style_set.styling[GCS_INDICATOR_ERROR].foreground));
/* Search indicator, used for 'Mark' matches */ /* Search indicator, used for 'Mark' matches */
SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX); SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX);