godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Fix the "set_val" call deferred, it was the only one.. closes #8742 

-Removed redundant bind in input_event
This commit is contained in:
Juan Linietsky 2017-05-23 09:06:22 -03:00
parent d093b78f12
commit afcce9eb12
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/input_event.cpp
View File

@ -816,7 +816,7 @@ void InputEventAction::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventAction::set_pressed); 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_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::STRING, "action"), "set_action", "get_action");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed");

2
scene/gui/tree.cpp
View File

@ -3032,7 +3032,7 @@ void Tree::ensure_cursor_is_visible() {
int screenh = get_size().height - h_scroll->get_combined_minimum_size().height; int screenh = get_size().height - h_scroll->get_combined_minimum_size().height;
if (ofs + h > v_scroll->get_value() + screenh) 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()) else if (ofs < v_scroll->get_value())
v_scroll->set_value(ofs); v_scroll->set_value(ofs);
} }