diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-03 14:36:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 14:36:32 +0200 |
| commit | b774156729b4b2f8a1fea6faf6e232fe809ea6f6 (patch) | |
| tree | c6175bb0af57e0da218e58b594d6b27cb3f2b61a /scene/gui | |
| parent | 12c60eba19fbb6971ea0ffa2cf8312ad42e84d65 (diff) | |
| parent | 3a86dffc5e6ce180c350ef9a9ddd019b24584d88 (diff) | |
Merge pull request #18514 from neikeq/api-hash-fixes
API hash fixes
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/line_edit.cpp | 6 | ||||
| -rw-r--r-- | scene/gui/line_edit.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index e3b8baf0c0..1ceb3f0a8b 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -1349,12 +1349,12 @@ PopupMenu *LineEdit::get_menu() const { return menu; } -#ifdef TOOLS_ENABLED void LineEdit::_editor_settings_changed() { +#ifdef TOOLS_ENABLED cursor_set_blink_enabled(EDITOR_DEF("text_editor/cursor/caret_blink", false)); cursor_set_blink_speed(EDITOR_DEF("text_editor/cursor/caret_blink_speed", 0.65)); -} #endif +} void LineEdit::set_expand_to_text_length(bool p_enabled) { @@ -1423,9 +1423,7 @@ void LineEdit::_bind_methods() { ClassDB::bind_method(D_METHOD("_text_changed"), &LineEdit::_text_changed); ClassDB::bind_method(D_METHOD("_toggle_draw_caret"), &LineEdit::_toggle_draw_caret); -#ifdef TOOLS_ENABLED ClassDB::bind_method("_editor_settings_changed", &LineEdit::_editor_settings_changed); -#endif ClassDB::bind_method(D_METHOD("set_align", "align"), &LineEdit::set_align); ClassDB::bind_method(D_METHOD("get_align"), &LineEdit::get_align); diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 48dde2461e..304faed9bd 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -135,9 +135,7 @@ private: void clear_internal(); void changed_internal(); -#ifdef TOOLS_ENABLED void _editor_settings_changed(); -#endif void _gui_input(Ref<InputEvent> p_event); void _notification(int p_what); |