summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorjonyrock <ilms@live.ru>2014-04-28 13:16:49 +0400
committerjonyrock <ilms@live.ru>2014-04-28 13:16:49 +0400
commita93ad6e321408756a3a316eb6511fc66411da9da (patch)
treedc1d55a94f2afe723da119a5e6a40f4f1531a103 /scene/gui
parenta5384bc07bc5b406df0ef33a446d09ebb35f7cd9 (diff)
#331 settings menu option title fix
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/text_edit.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 8b44bbdccf..e95f7ccfab 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 pair_symbols_tool = EDITOR_DEF("text_editor/pair_symbols_tool", false);
- if(pair_symbols_tool &&
+ bool auto_brace_tool = EDITOR_DEF("text_editor/auto_brace_tool", false);
+ if(auto_brace_tool &&
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 pair_symbols_tool=EDITOR_DEF("text_editor/pair_symbols_tool", false);
- if (pair_symbols_tool && _is_pair_left_symbol(k.unicode))
+ bool auto_brace_tool=EDITOR_DEF("text_editor/auto_brace_tool", false);
+ if (auto_brace_tool && _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 pair_symbols_tool = EDITOR_DEF("text_editor/pair_symbols_tool", false);
+ bool auto_brace_tool = EDITOR_DEF("text_editor/auto_brace_tool", false);
- if(pair_symbols_tool && _is_pair_symbol(chr[0])) {
+ if(auto_brace_tool && _is_pair_symbol(chr[0])) {
_consume_pair_symbol(chr[0]);
} else {
_insert_text_at_cursor(chr);