maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #443 from Shindoku/master

Browse source 
Added a setting to disable autocomplete popup and fixed the autocomplete...
This commit is contained in:
reduz 2014-05-21 19:19:41 -03:00
parent 8bb7cc7325 6b1b3fbfa5
commit fee28f7a9d
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/editor/code_editor.cpp
View file

@ -484,8 +484,8 @@ void CodeTextEditor::_text_changed() {
}
void CodeTextEditor::_code_complete_timer_timeout() {
text_editor->query_code_comple();
if (enable_complete_timer)
text_editor->query_code_comple();
}
void CodeTextEditor::_complete_request(const String& p_request, int p_line) {
@ -534,7 +534,12 @@ void CodeTextEditor::_on_settings_change() {
text_editor->set_auto_brace_completion(
EDITOR_DEF("text_editor/auto_brace_complete", false)
);
code_complete_timer->set_wait_time(
EDITOR_DEF("text_editor/code_complete_delay",.3f)
);
enable_complete_timer = EDITOR_DEF("text_editor/enable_code_completion_delay",true);
}
void CodeTextEditor::_text_changed_idle_timeout() {
@ -584,6 +589,8 @@ CodeTextEditor::CodeTextEditor() {
code_complete_timer = memnew(Timer);
add_child(code_complete_timer);
code_complete_timer->set_one_shot(true);
enable_complete_timer = EDITOR_DEF("text_editor/enable_code_completion_delay",true);
code_complete_timer->set_wait_time(EDITOR_DEF("text_editor/code_complete_delay",.3f));
error = memnew( Label );
@ -604,6 +611,7 @@ CodeTextEditor::CodeTextEditor() {
cs.push_back(".");
text_editor->set_completion(true,cs);
idle->connect("timeout", this,"_text_changed_idle_timeout");
code_complete_timer->connect("timeout", this,"_code_complete_timer_timeout");
EditorSettings::get_singleton()->connect("settings_changed",this,"_on_settings_change");

1
tools/editor/code_editor.h
View file

@ -129,6 +129,7 @@ class CodeTextEditor : public Control {
Label *info;
Timer *idle;
Timer *code_complete_timer;
bool enable_complete_timer;
Label *error;