summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-09-29 10:35:12 +0200
committerGitHub <noreply@github.com>2020-09-29 10:35:12 +0200
commitc217498aa654c869c858f702d3916ba69427d808 (patch)
treec884c12e40a4f58156b652bf48857d47e0b9f0d1 /scene
parentbebf424c80cce52c735000b48265538750068c5e (diff)
parentf6b14238c72cdd86d2617aa2f83d5dc5cca1562e (diff)
Merge pull request #41895 from 11thPenguin/master
Fix minor typo, gui_hid -> gui_hide
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/control.cpp2
-rw-r--r--scene/main/viewport.cpp2
-rw-r--r--scene/main/viewport.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 2cdee4641e..13d7440eb3 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -591,7 +591,7 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_VISIBILITY_CHANGED: {
if (!is_visible_in_tree()) {
if (get_viewport() != nullptr) {
- get_viewport()->_gui_hid_control(this);
+ get_viewport()->_gui_hide_control(this);
}
//remove key focus
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index b29b40ea5f..7fefbc3f3c 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2422,7 +2422,7 @@ void Viewport::_gui_unfocus_control(Control *p_control) {
}
}
-void Viewport::_gui_hid_control(Control *p_control) {
+void Viewport::_gui_hide_control(Control *p_control) {
if (gui.mouse_focus == p_control) {
_drop_mouse_focus();
}
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 52145a7761..878ac47bca 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -387,7 +387,7 @@ private:
void _gui_show_tooltip();
void _gui_remove_control(Control *p_control);
- void _gui_hid_control(Control *p_control);
+ void _gui_hide_control(Control *p_control);
void _gui_force_drag(Control *p_base, const Variant &p_data, Control *p_control);
void _gui_set_drag_preview(Control *p_base, Control *p_control);