diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:09:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-05 01:12:07 +0300 |
commit | acebfbb6669b4f0c546068777c7f11146aad3def (patch) | |
tree | b20db009b21a703a4daa5400dbc72e8196e59a78 /source/blender/editors/space_text | |
parent | 55137629462d3ca2fb152b56cfe26507bdd2c352 (diff) |
Cleanup: unnecessary comma use
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/text_autocomplete.c | 54 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 22 |
2 files changed, 59 insertions, 17 deletions
diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 2db2137784a..04cff288b03 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -327,8 +327,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e if (text_do_suggest_select(st, ar)) swallow = 1; else { - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } retval = OPERATOR_FINISHED; } draw = 1; @@ -342,8 +347,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e swallow = 1; } else { - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } retval = OPERATOR_FINISHED; } draw = 1; @@ -352,8 +362,13 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e case ESCKEY: if (event->val == KM_PRESS) { draw = swallow = 1; - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(); - else if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + } + else if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } else draw = swallow = 0; retval = OPERATOR_CANCELLED; } @@ -367,7 +382,11 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e swallow = 1; draw = 1; } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + draw = 1; + } retval = OPERATOR_FINISHED; } break; @@ -398,7 +417,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } } break; case RIGHTARROWKEY: @@ -427,7 +449,10 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e } } } - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0; + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + } } break; case PAGEDOWNKEY: @@ -498,8 +523,15 @@ static int text_autocomplete_modal(bContext *C, wmOperator *op, const wmEvent *e break; #if 0 default: - if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(), draw = 1; - if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll = 0, draw = 1; + if (tools & TOOL_SUGG_LIST) { + texttool_suggest_clear(); + draw = 1; + } + if (tools & TOOL_DOCUMENT) { + texttool_docs_clear(); + doc_scroll = 0; + draw = 1; + } #endif } diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 16087921ab6..9448f6af69f 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -1108,8 +1108,13 @@ static void draw_cursor(SpaceText *st, ARegion *ar) vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl; vselc = text_get_char_pos(st, text->sell->line, text->selc) - st->left + offc; - if (vcurc < 0) vcurc = 0; - if (vselc < 0) vselc = 0, hidden = 1; + if (vcurc < 0) { + vcurc = 0; + } + if (vselc < 0) { + vselc = 0; + hidden = 1; + } UI_ThemeColor(TH_SHADE2); x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET; @@ -1135,11 +1140,16 @@ static void draw_cursor(SpaceText *st, ARegion *ar) } y -= froml * lheight; - glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight); y -= lheight; - for (i = froml + 1; i < tol; i++) - glRecti(x - 4, y, ar->winx, y - lheight), y -= lheight; - glRecti(x - 4, y, x + toc * st->cwidth, y - lheight); y -= lheight; + glRecti(x + fromc * st->cwidth - 1, y, ar->winx, y - lheight); + y -= lheight; + for (i = froml + 1; i < tol; i++) { + glRecti(x - 4, y, ar->winx, y - lheight); + y -= lheight; + } + + glRecti(x - 4, y, x + toc * st->cwidth, y - lheight); + y -= lheight; } } else { |