Commit: b1777fbcb5960037fbc1a3fd9f94d7e98056981a
Author: Campbell Barton
Date: Sun Aug 30 12:25:04 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rBb1777fbcb5960037fbc1a3fd9f94d7e98056981a
Add newline support
===================================================================
M source/blender/blenfont/intern/blf_font.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index d0f478f..c46ee6c 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -702,7 +702,12 @@ static void blf_font_wrap_apply(
do_draw = true;
}
else if (UNLIKELY(((i < len) && str[i]) == 0)) {
- wrap.last[0] = i;
+ wrap.last[0] = i + 1;
+ wrap.last[1] = i;
+ do_draw = true;
+ }
+ else if (UNLIKELY(g->c == '\n')) {
+ wrap.last[0] = i_curr + 1;
wrap.last[1] = i;
do_draw = true;
}
@@ -712,8 +717,8 @@ static void blf_font_wrap_apply(
}
if (UNLIKELY(do_draw)) {
- // printf("(%d..%d) `%.*s`\n", wrap.start,
wrap.last[0], wrap.last[0] - wrap.start, &str[wrap.start]);
- callback(font, &str[wrap.start], wrap.last[0] -
wrap.start, pen_y, userdata);
+ // printf("(%d..%d) `%.*s`\n", wrap.start,
wrap.last[0], (wrap.last[0] - wrap.start) - 1, &str[wrap.start]);
+ callback(font, &str[wrap.start], (wrap.last[0] -
wrap.start) - 1, pen_y, userdata);
wrap.start = wrap.last[0];
i = wrap.last[1];
pen_x = 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
