[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15898] branches/soc-2008-quorn/source/ blender/src/drawtext.c: Accidentally removed too many BIF_ThemeColors resulting in funny colours for non-syntax-highlighted text .

Ian Thompson quornian at googlemail.com
Thu Jul 31 20:16:01 CEST 2008


Revision: 15898
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15898
Author:   quorn
Date:     2008-07-31 20:16:01 +0200 (Thu, 31 Jul 2008)

Log Message:
-----------
Accidentally removed too many BIF_ThemeColors resulting in funny colours for non-syntax-highlighted text.

Modified Paths:
--------------
    branches/soc-2008-quorn/source/blender/src/drawtext.c

Modified: branches/soc-2008-quorn/source/blender/src/drawtext.c
===================================================================
--- branches/soc-2008-quorn/source/blender/src/drawtext.c	2008-07-31 17:54:21 UTC (rev 15897)
+++ branches/soc-2008-quorn/source/blender/src/drawtext.c	2008-07-31 18:16:01 UTC (rev 15898)
@@ -92,12 +92,12 @@
 Notes on word-wrap
 --
 All word-wrap functions follow the algorithm below to maintain consistency.
-	line		The line to wrap
+	line		The line to wrap (tabs converted to spaces)
 	view_width	The maximum number of characters displayable in the region
 				This equals region_width/font_width for the region
 	wrap_chars	Characters that allow wrapping. This equals [' ', '\t', '-']
 
-def wrap(line, view_width, wrap_chars, tab_size):
+def wrap(line, view_width, wrap_chars):
 	draw_start = 0
 	draw_end = view_width
 	pos = 0
@@ -106,7 +106,6 @@
 			print line[draw_start:draw_end]
 			draw_start = draw_end
 			draw_end += view_width
-			tab_offset = 0
 		elif c in wrap_chars:
 			draw_end = pos+1
 		pos += 1
@@ -1291,6 +1290,7 @@
 	y= curarea->winy-st->lheight;
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 
+	BIF_ThemeColor(TH_TEXT);
 	for (i=0; y>0 && i<st->viewlines && tmp; i++, tmp= tmp->next) {
 		if (st->showsyntax && !tmp->format) {
 			txt_format_line(st, tmp, 0);





More information about the Bf-blender-cvs mailing list