diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 22:56:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 22:59:59 +0300 |
commit | 2b107beffd9b408ac1464288d07ee96214c09a30 (patch) | |
tree | 45feac6e7021cfb5db1f173b04c6cd3a86ed20e0 /source/blender/editors/space_text/text_draw.c | |
parent | bd401d9517ff32b29a807143ab2b5cf89fcb286e (diff) |
Fix T39144: text-select scrolling too fast
Use a timer to get predictable speed.
Diffstat (limited to 'source/blender/editors/space_text/text_draw.c')
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 60 |
1 files changed, 44 insertions, 16 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index af827d6dc5a..315f8a0aaec 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -28,8 +28,6 @@ * \ingroup sptext */ - - #include "MEM_guardedalloc.h" #include "BLF_api.h" @@ -44,6 +42,7 @@ #include "BKE_context.h" #include "BKE_suggestions.h" #include "BKE_text.h" +#include "BKE_screen.h" #include "BIF_gl.h" @@ -1461,22 +1460,15 @@ void text_update_character_width(SpaceText *st) /* Moves the view to the cursor location, * also used to make sure the view isn't outside the file */ -void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) +void text_scroll_to_cursor(SpaceText *st, ARegion *ar, const bool center) { Text *text; - ARegion *ar = NULL; - int i, x, winx = 0; + int i, x, winx = ar->winx; if (ELEM(NULL, st, st->text, st->text->curl)) return; text = st->text; - for (ar = sa->regionbase.first; ar; ar = ar->next) - if (ar->regiontype == RGN_TYPE_WINDOW) { - winx = ar->winx; - break; - } - text_update_character_width(st); i = txt_get_span(text->lines.first, text->sell); @@ -1486,8 +1478,19 @@ void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) i += offl; } - if (st->top + st->viewlines <= i || st->top > i) - st->top = i - st->viewlines / 2; + if (center) { + if (st->top + st->viewlines <= i || st->top > i) { + st->top = i - st->viewlines / 2; + } + } + else { + if (st->top + st->viewlines <= i) { + st->top = i - (st->viewlines - 1); + } + else if (st->top > i) { + st->top = i; + } + } if (st->wordwrap) { st->left = 0; @@ -1496,8 +1499,19 @@ void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) x = st->cwidth * (text_get_char_pos(st, text->sell->line, text->selc) - st->left); winx -= TXT_OFFSET + (st->showlinenrs ? TEXTXLOC : 0) + TXT_SCROLL_WIDTH; - if (x <= 0 || x > winx) - st->left += (x - winx / 2) / st->cwidth; + if (center) { + if (x <= 0 || x > winx) { + st->left += (x - winx / 2) / st->cwidth; + } + } + else { + if (x <= 0) { + st->left += ((x + 1) / st->cwidth) - 1; + } + else if (x > winx) { + st->left += ((x - (winx + 1)) / st->cwidth) + 1; + } + } } if (st->top < 0) st->top = 0; @@ -1507,10 +1521,24 @@ void text_scroll_to_cursor(SpaceText *st, ScrArea *sa) st->scroll_accum[1] = 0.0f; } +/* takes an area instead of a region, use for listeners */ +void text_scroll_to_cursor__area(SpaceText *st, ScrArea *sa, const bool center) +{ + ARegion *ar; + + if (ELEM(NULL, st, st->text, st->text->curl)) return; + + ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW); + + if (ar) { + text_scroll_to_cursor(st, ar, center); + } +} + void text_update_cursor_moved(bContext *C) { ScrArea *sa = CTX_wm_area(C); SpaceText *st = CTX_wm_space_text(C); - text_scroll_to_cursor(st, sa); + text_scroll_to_cursor__area(st, sa, true); } |