diff options
| author | jonyrock <ilms@live.ru> | 2014-04-28 13:31:58 +0400 |
|---|---|---|
| committer | jonyrock <ilms@live.ru> | 2014-04-28 13:31:58 +0400 |
| commit | 2c683b0f993127a0bf2150359403479caa258da0 (patch) | |
| tree | 22bf374f8aa074824f3aa863b493cbe003ecb646 | |
| parent | a93ad6e321408756a3a316eb6511fc66411da9da (diff) | |
#331 settings menu option title fix oops
| -rw-r--r-- | scene/gui/text_edit.cpp | 12 | ||||
| -rw-r--r-- | tools/editor/editor_settings.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index e95f7ccfab..bcfe6c1f95 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -839,8 +839,8 @@ void TextEdit::backspace_at_cursor() { int prev_line = cursor.column?cursor.line:cursor.line-1; int prev_column = cursor.column?(cursor.column-1):(text[cursor.line-1].length()); - bool auto_brace_tool = EDITOR_DEF("text_editor/auto_brace_tool", false); - if(auto_brace_tool && + bool auto_brace_complete = EDITOR_DEF("text_editor/auto_brace_complete", false); + if(auto_brace_complete && cursor.column > 0 && _is_pair_left_symbol(text[cursor.line][cursor.column - 1])) { _consume_backspace_for_pair_symbol(prev_line, prev_column); @@ -1246,8 +1246,8 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { default: if (k.unicode>=32 && !k.mod.command && !k.mod.alt && !k.mod.meta) clear=true; - bool auto_brace_tool=EDITOR_DEF("text_editor/auto_brace_tool", false); - if (auto_brace_tool && _is_pair_left_symbol(k.unicode)) + bool auto_brace_complete=EDITOR_DEF("text_editor/auto_brace_complete", false); + if (auto_brace_complete && _is_pair_left_symbol(k.unicode)) clear=false; } @@ -1674,9 +1674,9 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { const CharType chr[2] = {k.unicode, 0}; - bool auto_brace_tool = EDITOR_DEF("text_editor/auto_brace_tool", false); + bool auto_brace_complete = EDITOR_DEF("text_editor/auto_brace_complete", false); - if(auto_brace_tool && _is_pair_symbol(chr[0])) { + if(auto_brace_complete && _is_pair_symbol(chr[0])) { _consume_pair_symbol(chr[0]); } else { _insert_text_at_cursor(chr); diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 4c5a5ed38f..4a58b42a2e 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -402,7 +402,7 @@ void EditorSettings::_load_defaults() { set("text_editor/create_signal_callbacks",true); set("text_editor/autosave_interval_seconds",60); set("text_editor/font",""); - set("text_editor/auto_brace_tool", false); + set("text_editor/auto_brace_complete", false); hints["text_editor/font"]=PropertyInfo(Variant::STRING,"text_editor/font",PROPERTY_HINT_GLOBAL_FILE,"*.fnt"); |