diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 15:39:01 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-03 15:39:01 -0300 |
| commit | 167c1027bea5b208e5878c96682eb2bec6f59633 (patch) | |
| tree | 6cb05bdc4655f631c979aceaadf44b4754ebdedf /scene/gui/control.cpp | |
| parent | ffd4b22e09e0da3c6e14b59c930747d35535726b (diff) | |
-fixed bug on focus capture, now respets line/text edit
-when playing animations, property editor is now refreshed properly, fixes #1046
Diffstat (limited to 'scene/gui/control.cpp')
| -rw-r--r-- | scene/gui/control.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 068801d0bb..ce268843b1 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2684,8 +2684,8 @@ bool Control::is_stopping_mouse() const { Control *Control::get_focus_owner() const { ERR_FAIL_COND_V(!is_inside_tree(),NULL); - ERR_FAIL_COND_V(!window,NULL); - return window->key_focus; + ERR_FAIL_COND_V(!data.window,NULL); + return data.window->window->key_focus; } void Control::_bind_methods() { |