diff options
Diffstat (limited to 'core/input')
| -rw-r--r-- | core/input/input.cpp | 9 | ||||
| -rw-r--r-- | core/input/input_event.cpp | 6 | 
2 files changed, 9 insertions, 6 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp index 071d9ba648..c04fc894c8 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -231,14 +231,17 @@ Input::VelocityTrack::VelocityTrack() {  bool Input::is_anything_pressed() const {  	_THREAD_SAFE_METHOD_ +	if (!keys_pressed.is_empty() || !joy_buttons_pressed.is_empty() || !mouse_button_mask.is_empty()) { +		return true; +	} +  	for (const KeyValue<StringName, Input::Action> &E : action_state) {  		if (E.value.pressed) {  			return true;  		}  	} -	return !keys_pressed.is_empty() || -			!joy_buttons_pressed.is_empty() || -			!mouse_button_mask.is_empty(); + +	return false;  }  bool Input::is_key_pressed(Key p_keycode) const { diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp index 7c4642a8a5..a6c1bb168c 100644 --- a/core/input/input_event.cpp +++ b/core/input/input_event.cpp @@ -1186,14 +1186,14 @@ static const char *_joy_button_descriptions[(size_t)JoyButton::SDL_MAX] = {  };  String InputEventJoypadButton::as_text() const { -	String text = "Joypad Button " + itos((int64_t)button_index); +	String text = vformat(RTR("Joypad Button %d"), (int64_t)button_index);  	if (button_index > JoyButton::INVALID && button_index < JoyButton::SDL_MAX) { -		text += vformat(" (%s)", _joy_button_descriptions[(size_t)button_index]); +		text += vformat(" (%s)", TTRGET(_joy_button_descriptions[(size_t)button_index]));  	}  	if (pressure != 0) { -		text += ", Pressure:" + String(Variant(pressure)); +		text += ", " + RTR("Pressure:") + " " + String(Variant(pressure));  	}  	return text;  |