diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-28 16:20:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 16:20:20 +0200 |
| commit | d44c5cfcf72eec2fbf76afe6fd9e43ee3bcab216 (patch) | |
| tree | 4ce75cb592dbf7ce1f367f778a8b3b306727b2f8 /scene/gui/popup_menu.cpp | |
| parent | b9e58ed5b869cf2caf946be9a5e3b9066e1387eb (diff) | |
| parent | fdf58a585839804c89798392dd93025dbe8654e4 (diff) | |
Merge pull request #38295 from akien-mga/input-is-back
Rename InputFilter back to Input
Diffstat (limited to 'scene/gui/popup_menu.cpp')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 1e933c9aa1..a247863298 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -30,7 +30,7 @@ #include "popup_menu.h" -#include "core/input/input_filter.h" +#include "core/input/input.h" #include "core/os/keyboard.h" #include "core/os/os.h" #include "core/print_string.h" @@ -594,7 +594,7 @@ void PopupMenu::_notification(int p_what) { } break; case NOTIFICATION_POST_POPUP: { - initial_button_mask = InputFilter::get_singleton()->get_mouse_button_mask(); + initial_button_mask = Input::get_singleton()->get_mouse_button_mask(); during_grabbed_click = (bool)initial_button_mask; } break; case NOTIFICATION_WM_SIZE_CHANGED: { |