SF.net SVN: geany:[3935] trunk

[eht16 at users.sourceforge.net]

Revision: 3935
          http://geany.svn.sourceforge.net/geany/?rev=3935&view=rev
Author:   eht16
Date:     2009-07-08 22:21:45 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
Add style 'line_height' to increase the line height.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.common
    trunk/doc/geany.txt
    trunk/src/highlighting.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-08 22:20:41 UTC (rev 3934)
+++ trunk/ChangeLog	2009-07-08 22:21:45 UTC (rev 3935)
@@ -4,6 +4,8 @@
    Rework the GIO based file monitoring code. Now it is used only
    to indicate a possible change of the file, the real check if the
    file has been changed is performed by stat().
+ * data/filetypes.common, doc/geany.txt, src/highlighting.c:
+   Add style 'line_height' to increase the line height.
 
 
 2009-07-08  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common	2009-07-08 22:20:41 UTC (rev 3934)
+++ trunk/data/filetypes.common	2009-07-08 22:21:45 UTC (rev 3935)
@@ -88,6 +88,11 @@
 # 2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation
 line_wrap_indent=0;1;false;false
 
+# only first and second argument is interpreted
+# first argument: amount of space to be drawn above the line's baseline
+# second argument: amount of space to be drawn below the line's baseline
+line_height=0;0;false;false
+
 [settings]
 # which characters should be skipped when moving (or included when deleting) to word boundaries
 # should always include space and tab (\s\t)

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2009-07-08 22:20:41 UTC (rev 3934)
+++ trunk/doc/geany.txt	2009-07-08 22:21:45 UTC (rev 3935)
@@ -3330,7 +3330,16 @@
 
     *Example:* ``marker_translucency=256;256;false;false``
 
+line_height
+    Amount of space to be drawn above and below the line's baseline.
+    The first argument defines the amount of space to be drawn above the line, the second
+    argument defines the amount of space to be drawn below.
 
+    Only the first and second argument is interpreted.
+
+    *Example:* ``line_height=0;0;false;false``
+
+
 [settings] Section
 ``````````````````
 whitespace_chars

Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c	2009-07-08 22:20:41 UTC (rev 3934)
+++ trunk/src/highlighting.c	2009-07-08 22:21:45 UTC (rev 3935)
@@ -83,6 +83,7 @@
 	GCS_MARKER_LINE,
 	GCS_MARKER_SEARCH,
 	GCS_MARKER_TRANSLUCENCY,
+	GCS_LINE_HEIGHT,
 	GCS_MAX
 };
 
@@ -580,6 +581,10 @@
 			256, 256, &tmp_style);
 		common_style_set.styling[GCS_MARKER_TRANSLUCENCY].foreground = tmp_style.foreground;
 		common_style_set.styling[GCS_MARKER_TRANSLUCENCY].background = tmp_style.background;
+		get_keyfile_int(config, config_home, "styling", "line_height",
+			0, 0, &tmp_style);
+		common_style_set.styling[GCS_LINE_HEIGHT].foreground = tmp_style.foreground;
+		common_style_set.styling[GCS_LINE_HEIGHT].background = tmp_style.background;
 	}
 
 	common_style_set.invert_all = interface_prefs.highlighting_invert_all =
@@ -601,6 +606,10 @@
 	else
 		SSM(sci, SCI_SETCARETSTYLE, CARETSTYLE_LINE, 0);
 
+	/* line height */
+	SSM(sci, SCI_SETEXTRAASCENT, common_style_set.styling[GCS_LINE_HEIGHT].foreground, 0);
+	SSM(sci, SCI_SETEXTRADESCENT, common_style_set.styling[GCS_LINE_HEIGHT].background, 0);
+
 	/* colourise the current line */
 	SSM(sci, SCI_SETCARETLINEBACK, invert(common_style_set.styling[GCS_CURRENT_LINE].background), 0);
 	/* bold=enable current line */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.