[geany/geany] bee380: Allow to configure the error indicator color - Commits

24 Oct 2016


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Mon, 24 Oct 2016 10:27:59 UTC
Commit:      bee3806d47aed09f495bb74dbd6b48032a70f166
             https://github.com/geany/geany/commit/bee3806d47aed09f495bb74dbd6b48032a70f1...
Log Message:
-----------
Allow to configure the error indicator color
Related to #1116.
Modified Paths:
--------------
    data/filedefs/filetypes.common
    doc/geany.txt
    src/highlighting.c
Modified: data/filedefs/filetypes.common
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -93,6 +93,9 @@ line_height=0;0;
 # 4th argument is true to override default background of calltips
 calltips=call_tips
+# error indicator color
+indicator_error=0xff0000
+
 [settings]
 # which characters should be skipped when moving (or included when deleting) to word boundaries
 # should always include space and tab (\s\t)
Modified: doc/geany.txt
7 lines changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -4593,6 +4593,13 @@ calltips
*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
 ``````````````````
Modified: src/highlighting.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -97,6 +97,7 @@ enum	/* Geany common styling */
    GCS_MARKER_TRANSLUCENCY,
    GCS_LINE_HEIGHT,
    GCS_CALLTIPS,
+	GCS_INDICATOR_ERROR,
    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_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, "indicator_error", &common_style_set.styling[GCS_INDICATOR_ERROR]);
get_keyfile_ints(config, config_home, "styling", "folding_style",
    	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 */
    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 */
    SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    