summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMarcelo Fernandez <marcelofg55@gmail.com>2017-08-11 12:04:32 -0300
committerMarcelo Fernandez <marcelofg55@gmail.com>2017-08-17 11:28:45 -0300
commitaae29c7a0eace9ccfeb430c5a4ebd0c9a431e272 (patch)
tree5976e649a45e44a35e7644d6dfcd012af3009aec /core
parent23f6d3fa69935c90c6cdcee342ae99d226e9b4ab (diff)
Added notification const NOTIFICATION_WM_ABOUT
Diffstat (limited to 'core')
-rw-r--r--core/os/main_loop.cpp2
-rw-r--r--core/os/main_loop.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 248f5537c6..6d07e2a39c 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -54,6 +54,8 @@ void MainLoop::_bind_methods() {
BIND_CONSTANT(NOTIFICATION_WM_QUIT_REQUEST);
BIND_CONSTANT(NOTIFICATION_WM_UNFOCUS_REQUEST);
BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
+ BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
+ BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
};
void MainLoop::set_init_script(const Ref<Script> &p_init_script) {
diff --git a/core/os/main_loop.h b/core/os/main_loop.h
index 23b352468e..a0125ec13c 100644
--- a/core/os/main_loop.h
+++ b/core/os/main_loop.h
@@ -56,7 +56,11 @@ public:
NOTIFICATION_WM_GO_BACK_REQUEST = 7,
NOTIFICATION_WM_UNFOCUS_REQUEST = 8,
NOTIFICATION_OS_MEMORY_WARNING = 9,
- NOTIFICATION_TRANSLATION_CHANGED = 10,
+ // Note: NOTIFICATION_TRANSLATION_CHANGED and NOTIFICATION_WM_ABOUT used to have id=10 and id=11 but these
+ // conflict with NOTIFICATION_ENTER_TREE (id=10) and NOTIFICATION_EXIT_TREE (id=11), so id=90 and id=91
+ // fixes this issue.
+ NOTIFICATION_TRANSLATION_CHANGED = 90,
+ NOTIFICATION_WM_ABOUT = 91,
};
virtual void input_event(const Ref<InputEvent> &p_event);