Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Thompson <quornian@googlemail.com>2008-07-31 22:16:01 +0400
committerIan Thompson <quornian@googlemail.com>2008-07-31 22:16:01 +0400
commit2c4a1bf3819a8f9aa027c7231cef9ade8762bea7 (patch)
tree2034d376b5cfbd2ea1ed8bb514f26b048f7a8ba5 /source/blender/src/drawtext.c
parent726982be295ec497827926b336b933d5d3868052 (diff)
Accidentally removed too many BIF_ThemeColors resulting in funny colours for non-syntax-highlighted text.
Diffstat (limited to 'source/blender/src/drawtext.c')
-rw-r--r--source/blender/src/drawtext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index f4f8ebf3158..3cd552c563b 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -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 @@ def wrap(line, view_width, wrap_chars, tab_size):
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 @@ void drawtextspace(ScrArea *sa, void *spacedata)
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);