diff options
author | Sergey Pusnei <sergey.pusnei@gmail.com> | 2017-03-29 11:29:38 -0400 |
---|---|---|
committer | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-04-10 08:27:34 +0200 |
commit | 8589ca390373ae2e84d93b4a75640277e38e9780 (patch) | |
tree | 4c66a5b3927649c737b631c05ed88e866455e566 /editor/project_settings.cpp | |
parent | 1c480698ce0e881cbd28f1f0ddba95cee74ca834 (diff) |
Rename [gs]et_pos to [gs]et_position for Controls
Control set_pos -> set_position
Control set_global_pos -> set_global_position
[gs]et_mouse_pos -> [gs]et_mouse_position
[gs]et_global_mouse_pos -> [gs]et_global_mouse_position
fixes #8005
Diffstat (limited to 'editor/project_settings.cpp')
-rw-r--r-- | editor/project_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp index 77af64d9e3..a45ea26086 100644 --- a/editor/project_settings.cpp +++ b/editor/project_settings.cpp @@ -397,12 +397,12 @@ void ProjectSettings::_action_button_pressed(Object *p_obj, int p_column, int p_ ERR_FAIL_COND(!ti); if (p_id == 1) { - Point2 ofs = input_editor->get_global_pos(); + Point2 ofs = input_editor->get_global_position(); Rect2 ir = input_editor->get_item_rect(ti); ir.pos.y -= input_editor->get_scroll().y; ofs += ir.pos + ir.size; ofs.x -= 100; - popup_add->set_pos(ofs); + popup_add->set_position(ofs); popup_add->popup(); add_at = "input/" + ti->get_text(0); @@ -1326,7 +1326,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { l = memnew(Label); vbc->add_child(l); - l->set_pos(Point2(6, 5)); + l->set_position(Point2(6, 5)); l->set_text(TTR("Action:")); hbc = memnew(HBoxContainer); |