[Bf-blender-cvs] [f39aa17] master: Text Editor: Autocomplete suggestion wrap-around

Campbell Barton noreply at git.blender.org
Sat Jan 9 00:12:02 CET 2016


Commit: f39aa170586e2d713488ad81eaec46893db0f0fe
Author: Campbell Barton
Date:   Sat Jan 9 10:03:30 2016 +1100
Branches: master
https://developer.blender.org/rBf39aa170586e2d713488ad81eaec46893db0f0fe

Text Editor: Autocomplete suggestion wrap-around

D1716 by @someonewithpc

===================================================================

M	source/blender/editors/space_text/text_autocomplete.c

===================================================================

diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c
index 1637ae1..2db2137 100644
--- a/source/blender/editors/space_text/text_autocomplete.c
+++ b/source/blender/editors/space_text/text_autocomplete.c
@@ -447,9 +447,15 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 						texttool_suggest_select(texttool_suggest_first());
 					}
 					else {
-						while (sel && sel != texttool_suggest_last() && sel->next && scroll--) {
-							texttool_suggest_select(sel->next);
-							sel = sel->next;
+						while (sel && scroll--) {
+							if (sel != texttool_suggest_last() && sel->next) {
+								texttool_suggest_select(sel->next);
+								sel = sel->next;
+							}
+							else {
+								texttool_suggest_select(texttool_suggest_first());
+								sel = texttool_suggest_first();
+							}
 						}
 					}
 					text_pop_suggest_list();
@@ -471,9 +477,15 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e
 				}
 				else if (tools & TOOL_SUGG_LIST) {
 					SuggItem *sel = texttool_suggest_selected();
-					while (sel && sel != texttool_suggest_first() && sel->prev && scroll--) {
-						texttool_suggest_select(sel->prev);
-						sel = sel->prev;
+					while (sel && scroll--) {
+						if (sel != texttool_suggest_first() && sel->prev) {
+							texttool_suggest_select(sel->prev);
+							sel = sel->prev;
+						}
+						else {
+							texttool_suggest_select(texttool_suggest_last());
+							sel = texttool_suggest_last();
+						}
 					}
 					text_pop_suggest_list();
 					swallow = 1;




More information about the Bf-blender-cvs mailing list