From 8589ca390373ae2e84d93b4a75640277e38e9780 Mon Sep 17 00:00:00 2001
From: Sergey Pusnei
Date: Wed, 29 Mar 2017 11:29:38 -0400
Subject: 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
---
 scene/gui/popup_menu.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'scene/gui/popup_menu.cpp')

diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index de16f3c52..6ac6eac65 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -169,7 +169,7 @@ void PopupMenu::_activate_submenu(int over) {
 	if (pm->is_visible_in_tree())
 		return; //already visible!
 
-	Point2 p = get_global_pos();
+	Point2 p = get_global_position();
 	Rect2 pr(p, get_size());
 	Ref<StyleBox> style = get_stylebox("panel");
 
@@ -179,13 +179,13 @@ void PopupMenu::_activate_submenu(int over) {
 	if (pos.x + size.width > get_viewport_rect().size.width)
 		pos.x = p.x - size.width;
 
-	pm->set_pos(pos);
+	pm->set_position(pos);
 	pm->popup();
 
 	PopupMenu *pum = pm->cast_to<PopupMenu>();
 	if (pum) {
 
-		pr.pos -= pum->get_global_pos();
+		pr.pos -= pum->get_global_position();
 		pum->clear_autohide_areas();
 		pum->add_autohide_area(Rect2(pr.pos.x, pr.pos.y, pr.size.x, items[over]._ofs_cache));
 		if (over < items.size() - 1) {
@@ -266,15 +266,15 @@ void PopupMenu::_gui_input(const InputEvent &p_event) {
 
 				case BUTTON_WHEEL_DOWN: {
 
-					if (get_global_pos().y + get_size().y > get_viewport_rect().size.y) {
+					if (get_global_position().y + get_size().y > get_viewport_rect().size.y) {
 
 						int vseparation = get_constant("vseparation");
 						Ref<Font> font = get_font("font");
 
-						Point2 pos = get_pos();
+						Point2 pos = get_position();
 						int s = (vseparation + font->get_height()) * 3;
 						pos.y -= s;
-						set_pos(pos);
+						set_position(pos);
 
 						//update hover
 						InputEvent ie;
@@ -286,15 +286,15 @@ void PopupMenu::_gui_input(const InputEvent &p_event) {
 				} break;
 				case BUTTON_WHEEL_UP: {
 
-					if (get_global_pos().y < 0) {
+					if (get_global_position().y < 0) {
 
 						int vseparation = get_constant("vseparation");
 						Ref<Font> font = get_font("font");
 
-						Point2 pos = get_pos();
+						Point2 pos = get_position();
 						int s = (vseparation + font->get_height()) * 3;
 						pos.y += s;
-						set_pos(pos);
+						set_position(pos);
 
 						//update hover
 						InputEvent ie;
-- 
cgit v1.2.3-70-g09d2