diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-05-23 09:06:22 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-05-23 09:06:22 -0300 |
| commit | afcce9eb12a6163e8052aafe8351515313e76847 (patch) | |
| tree | 4af88d30201cb1ddaff9314b69785bd712d0ca3a | |
| parent | d093b78f129568251ca508f7fcd65bea69350fd9 (diff) | |
| download | redot-engine-afcce9eb12a6163e8052aafe8351515313e76847.tar.gz | |
-Fix the "set_val" call deferred, it was the only one.. closes #8742
-Removed redundant bind in input_event
| -rw-r--r-- | core/os/input_event.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index b2febb1a63..73eaa33dbb 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -816,7 +816,7 @@ void InputEventAction::_bind_methods() { ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventAction::set_pressed); //ClassDB::bind_method(D_METHOD("is_pressed"), &InputEventAction::is_pressed); - ClassDB::bind_method(D_METHOD("is_action", "name"), &InputEventAction::is_action); + // ClassDB::bind_method(D_METHOD("is_action", "name"), &InputEventAction::is_action); ADD_PROPERTY(PropertyInfo(Variant::STRING, "action"), "set_action", "get_action"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed"); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 9ada68f5dc..b17192fe4f 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -3032,7 +3032,7 @@ void Tree::ensure_cursor_is_visible() { int screenh = get_size().height - h_scroll->get_combined_minimum_size().height; if (ofs + h > v_scroll->get_value() + screenh) - v_scroll->call_deferred("set_val", ofs - screenh + h); + v_scroll->call_deferred("set_value", ofs - screenh + h); else if (ofs < v_scroll->get_value()) v_scroll->set_value(ofs); } |