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

Fix analog input in sliders

This commit is contained in:
Tomasz Chabora 2019-10-24 23:51:33 +02:00
parent 930d6d8ca4
commit a7b202ef18
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/os/input_event.cpp
View File

@ -49,11 +49,11 @@ bool InputEvent::is_action(const StringName &p_action) const {
return InputMap::get_singleton()->event_is_action(Ref<InputEvent>((InputEvent *)this), p_action); return InputMap::get_singleton()->event_is_action(Ref<InputEvent>((InputEvent *)this), p_action);
} }
bool InputEvent::is_action_pressed(const StringName &p_action) const { bool InputEvent::is_action_pressed(const StringName &p_action, bool p_allow_echo) const {
bool pressed; bool pressed;
bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed); bool valid = InputMap::get_singleton()->event_get_action_status(Ref<InputEvent>((InputEvent *)this), p_action, &pressed);
return valid && pressed && !is_echo(); return valid && pressed && (p_allow_echo || !is_echo());
} }
bool InputEvent::is_action_released(const StringName &p_action) const { bool InputEvent::is_action_released(const StringName &p_action) const {
@ -112,7 +112,7 @@ void InputEvent::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_device"), &InputEvent::get_device); ClassDB::bind_method(D_METHOD("get_device"), &InputEvent::get_device);
ClassDB::bind_method(D_METHOD("is_action", "action"), &InputEvent::is_action); ClassDB::bind_method(D_METHOD("is_action", "action"), &InputEvent::is_action);
ClassDB::bind_method(D_METHOD("is_action_pressed", "action"), &InputEvent::is_action_pressed); ClassDB::bind_method(D_METHOD("is_action_pressed", "action"), &InputEvent::is_action_pressed, DEFVAL(false));
ClassDB::bind_method(D_METHOD("is_action_released", "action"), &InputEvent::is_action_released); ClassDB::bind_method(D_METHOD("is_action_released", "action"), &InputEvent::is_action_released);
ClassDB::bind_method(D_METHOD("get_action_strength", "action"), &InputEvent::get_action_strength); ClassDB::bind_method(D_METHOD("get_action_strength", "action"), &InputEvent::get_action_strength);

2
core/os/input_event.h
View File

@ -184,7 +184,7 @@ public:
int get_device() const; int get_device() const;
bool is_action(const StringName &p_action) const; bool is_action(const StringName &p_action) const;
bool is_action_pressed(const StringName &p_action) const; bool is_action_pressed(const StringName &p_action, bool p_allow_echo = false) const;
bool is_action_released(const StringName &p_action) const; bool is_action_released(const StringName &p_action) const;
float get_action_strength(const StringName &p_action) const; float get_action_strength(const StringName &p_action) const;

8
scene/gui/slider.cpp
View File

@ -101,26 +101,26 @@ void Slider::_gui_input(Ref<InputEvent> p_event) {
if (!mm.is_valid() && !mb.is_valid()) { if (!mm.is_valid() && !mb.is_valid()) {
if (p_event->is_action("ui_left") && p_event->is_pressed()) { if (p_event->is_action_pressed("ui_left", true)) {
if (orientation != HORIZONTAL) if (orientation != HORIZONTAL)
return; return;
set_value(get_value() - (custom_step >= 0 ? custom_step : get_step())); set_value(get_value() - (custom_step >= 0 ? custom_step : get_step()));
accept_event(); accept_event();
} else if (p_event->is_action("ui_right") && p_event->is_pressed()) { } else if (p_event->is_action_pressed("ui_right", true)) {
if (orientation != HORIZONTAL) if (orientation != HORIZONTAL)
return; return;
set_value(get_value() + (custom_step >= 0 ? custom_step : get_step())); set_value(get_value() + (custom_step >= 0 ? custom_step : get_step()));
accept_event(); accept_event();
} else if (p_event->is_action("ui_up") && p_event->is_pressed()) { } else if (p_event->is_action_pressed("ui_up", true)) {
if (orientation != VERTICAL) if (orientation != VERTICAL)
return; return;
set_value(get_value() + (custom_step >= 0 ? custom_step : get_step())); set_value(get_value() + (custom_step >= 0 ? custom_step : get_step()));
accept_event(); accept_event();
} else if (p_event->is_action("ui_down") && p_event->is_pressed()) { } else if (p_event->is_action_pressed("ui_down", true)) {
if (orientation != VERTICAL) if (orientation != VERTICAL)
return; return;