diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-28 23:03:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 23:03:10 +0100 |
| commit | a1cbe8e22bec516b138436d06282046466e89c79 (patch) | |
| tree | 24c8d7757a3f1d9e3543a8eff1363f0f7943cbc6 /scene/gui | |
| parent | c5df3d4d8d3d6ee74b0dad5eeb45f318c8b205a9 (diff) | |
| parent | f50488a36188d5975bfa8554687a1acdd394d6a9 (diff) | |
Merge pull request #7878 from RebelliousX/else
Bunch of missing `else` statements and general logic
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/dialogs.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/item_list.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.h | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index cffe2ce218..4161725ad5 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2421,8 +2421,6 @@ void Control::get_argument_options(const StringName& p_function,int p_idx,List<S Theme::get_default()->get_font_list(get_class(),&sn); } else if (pf=="add_constant_override" || pf=="has_constant" || pf=="has_constant_override" || pf=="get_constant") { Theme::get_default()->get_constant_list(get_class(),&sn); - } else if (pf=="add_color_override" || pf=="has_color" || pf=="has_color_override" || pf=="get_color") { - Theme::get_default()->get_color_list(get_class(),&sn); } sn.sort_custom<StringName::AlphCompare>(); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 72d3f0e8f8..e08d933e03 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -201,7 +201,7 @@ void AcceptDialog::_notification(int p_what) { if (p_what==NOTIFICATION_MODAL_CLOSE) { cancel_pressed(); - } if (p_what==NOTIFICATION_RESIZED) { + } else if (p_what==NOTIFICATION_RESIZED) { _update_child_rects(); } diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index a35df53e52..91bd16ee0b 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -314,7 +314,7 @@ void ItemList::move_item(int p_item,int p_to_pos) { if (current<0) { //do none - } if (p_item==current) { + } else if (p_item==current) { current=p_to_pos; } else if (p_to_pos>p_item && current>p_item && current<p_to_pos) { current--; diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index c675cfbefb..3bdd2cd7e3 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -173,7 +173,7 @@ private: struct ItemNewline : public Item { - int line; + int line; // FIXME: Overriding base's line ? ItemNewline() { type=ITEM_NEWLINE; } }; diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 3f2eab8bef..f1b061c506 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -4267,7 +4267,7 @@ void TextEdit::_update_completion_candidates() { //no completion here //print_line("cancel!"); cancel=true; - } if (inquote && first_quote!=-1) { + } else if (inquote && first_quote!=-1) { s=l.substr(first_quote,cofs-first_quote); //print_line("s: 1"+s); |