summaryrefslogtreecommitdiff
path: root/scene/gui/control.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui/control.cpp')
-rw-r--r--scene/gui/control.cpp22
1 files changed, 13 insertions, 9 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 2e6dd48442..533d24f998 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -468,10 +468,12 @@ void Control::_notification(int p_notification) {
}
- //if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
- // data.theme_owner=data.parent->data.theme_owner;
- // notification(NOTIFICATION_THEME_CHANGED);
- //}
+ /*
+ if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
+ data.theme_owner=data.parent->data.theme_owner;
+ notification(NOTIFICATION_THEME_CHANGED);
+ }
+ */
} break;
case NOTIFICATION_EXIT_CANVAS: {
@@ -503,10 +505,12 @@ void Control::_notification(int p_notification) {
data.parent=NULL;
data.parent_canvas_item=NULL;
- //if (data.theme_owner && data.theme.is_null()) {
- // data.theme_owner=NULL;
- //notification(NOTIFICATION_THEME_CHANGED);
- //}
+ /*
+ if (data.theme_owner && data.theme.is_null()) {
+ data.theme_owner=NULL;
+ notification(NOTIFICATION_THEME_CHANGED);
+ }
+ */
} break;
case NOTIFICATION_MOVED_IN_PARENT: {
@@ -2444,7 +2448,7 @@ bool Control::is_clipping_contents() {
void Control::_bind_methods() {
-// ClassDB::bind_method(_MD("_window_resize_event"),&Control::_window_resize_event);
+ //ClassDB::bind_method(_MD("_window_resize_event"),&Control::_window_resize_event);
ClassDB::bind_method(_MD("_size_changed"),&Control::_size_changed);
ClassDB::bind_method(_MD("_update_minimum_size"),&Control::_update_minimum_size);