Merge pull request #51684 from aaronfranke/enum-class

5 files changed, 150 insertions, 146 deletions

diff --git a/platform/android/android_input_handler.cpp b/platform/android/android_input_handler.cpp
index e03375e8d9..dc259da886 100644
--- a/platform/android/android_input_handler.cpp
+++ b/platform/android/android_input_handler.cpp
@@ -45,7 +45,7 @@ void AndroidInputHandler::process_joy_event(AndroidInputHandler::JoypadEvent p_e
 			Input::get_singleton()->joy_axis(p_event.device, (JoyAxis)p_event.index, value);
 			break;
 		case JOY_EVENT_HAT:
-			Input::get_singleton()->joy_hat(p_event.device, (HatMask)p_event.hat);
+			Input::get_singleton()->joy_hat(p_event.device, p_event.hat);
 			break;
 		default:
 			return;
@@ -82,37 +82,37 @@ void AndroidInputHandler::process_key_event(int p_keycode, int p_scancode, int p
 	Ref<InputEventKey> ev;
 	ev.instantiate();
 	int val = unicode;
-	int keycode = android_get_keysym(p_keycode);
-	int phy_keycode = android_get_keysym(p_scancode);
+	Key keycode = android_get_keysym(p_keycode);
+	Key phy_keycode = android_get_keysym(p_scancode);
 
-	if (keycode == KEY_SHIFT) {
+	if (keycode == Key::SHIFT) {
 		shift_mem = p_pressed;
 	}
-	if (keycode == KEY_ALT) {
+	if (keycode == Key::ALT) {
 		alt_mem = p_pressed;
 	}
-	if (keycode == KEY_CTRL) {
+	if (keycode == Key::CTRL) {
 		control_mem = p_pressed;
 	}
-	if (keycode == KEY_META) {
+	if (keycode == Key::META) {
 		meta_mem = p_pressed;
 	}
 
-	ev->set_keycode((Key)keycode);
-	ev->set_physical_keycode((Key)phy_keycode);
+	ev->set_keycode(keycode);
+	ev->set_physical_keycode(phy_keycode);
 	ev->set_unicode(val);
 	ev->set_pressed(p_pressed);
 
 	_set_key_modifier_state(ev);
 
 	if (val == '\n') {
-		ev->set_keycode(KEY_ENTER);
+		ev->set_keycode(Key::ENTER);
 	} else if (val == 61448) {
-		ev->set_keycode(KEY_BACKSPACE);
-		ev->set_unicode(KEY_BACKSPACE);
+		ev->set_keycode(Key::BACKSPACE);
+		ev->set_unicode((char32_t)Key::BACKSPACE);
 	} else if (val == 61453) {
-		ev->set_keycode(KEY_ENTER);
-		ev->set_unicode(KEY_ENTER);
+		ev->set_keycode(Key::ENTER);
+		ev->set_unicode((char32_t)Key::ENTER);
 	} else if (p_keycode == 4) {
 		if (DisplayServerAndroid *dsa = Object::cast_to<DisplayServerAndroid>(DisplayServer::get_singleton())) {
 			dsa->send_window_event(DisplayServer::WINDOW_EVENT_GO_BACK_REQUEST, true);
@@ -305,15 +305,15 @@ void AndroidInputHandler::process_mouse_event(int input_device, int event_action
 			ev->set_pressed(true);
 			buttons_state = event_buttons_mask;
 			if (event_vertical_factor > 0) {
-				_wheel_button_click(event_buttons_mask, ev, MOUSE_BUTTON_WHEEL_UP, event_vertical_factor);
+				_wheel_button_click(event_buttons_mask, ev, MouseButton::WHEEL_UP, event_vertical_factor);
 			} else if (event_vertical_factor < 0) {
-				_wheel_button_click(event_buttons_mask, ev, MOUSE_BUTTON_WHEEL_DOWN, -event_vertical_factor);
+				_wheel_button_click(event_buttons_mask, ev, MouseButton::WHEEL_DOWN, -event_vertical_factor);
 			}
 
 			if (event_horizontal_factor > 0) {
-				_wheel_button_click(event_buttons_mask, ev, MOUSE_BUTTON_WHEEL_RIGHT, event_horizontal_factor);
+				_wheel_button_click(event_buttons_mask, ev, MouseButton::WHEEL_RIGHT, event_horizontal_factor);
 			} else if (event_horizontal_factor < 0) {
-				_wheel_button_click(event_buttons_mask, ev, MOUSE_BUTTON_WHEEL_LEFT, -event_horizontal_factor);
+				_wheel_button_click(event_buttons_mask, ev, MouseButton::WHEEL_LEFT, -event_horizontal_factor);
 			}
 		} break;
 	}
@@ -323,7 +323,7 @@ void AndroidInputHandler::_wheel_button_click(MouseButton event_buttons_mask, co
 	Ref<InputEventMouseButton> evd = ev->duplicate();
 	_set_key_modifier_state(evd);
 	evd->set_button_index(wheel_button);
-	evd->set_button_mask(MouseButton(event_buttons_mask ^ (1 << (wheel_button - 1))));
+	evd->set_button_mask(MouseButton(event_buttons_mask ^ mouse_button_to_mask(wheel_button)));
 	evd->set_factor(factor);
 	Input::get_singleton()->parse_input_event(evd);
 	Ref<InputEventMouseButton> evdd = evd->duplicate();
@@ -339,7 +339,7 @@ void AndroidInputHandler::process_double_tap(int event_android_button_mask, Poin
 	_set_key_modifier_state(ev);
 	ev->set_position(p_pos);
 	ev->set_global_position(p_pos);
-	ev->set_pressed(event_button_mask != 0);
+	ev->set_pressed(event_button_mask != MouseButton::NONE);
 	ev->set_button_index(_button_index_from_mask(event_button_mask));
 	ev->set_button_mask(event_button_mask);
 	ev->set_double_click(true);
@@ -348,37 +348,37 @@ void AndroidInputHandler::process_double_tap(int event_android_button_mask, Poin
 
 MouseButton AndroidInputHandler::_button_index_from_mask(MouseButton button_mask) {
 	switch (button_mask) {
-		case MOUSE_BUTTON_MASK_LEFT:
-			return MOUSE_BUTTON_LEFT;
-		case MOUSE_BUTTON_MASK_RIGHT:
-			return MOUSE_BUTTON_RIGHT;
-		case MOUSE_BUTTON_MASK_MIDDLE:
-			return MOUSE_BUTTON_MIDDLE;
-		case MOUSE_BUTTON_MASK_XBUTTON1:
-			return MOUSE_BUTTON_XBUTTON1;
-		case MOUSE_BUTTON_MASK_XBUTTON2:
-			return MOUSE_BUTTON_XBUTTON2;
+		case MouseButton::MASK_LEFT:
+			return MouseButton::LEFT;
+		case MouseButton::MASK_RIGHT:
+			return MouseButton::RIGHT;
+		case MouseButton::MASK_MIDDLE:
+			return MouseButton::MIDDLE;
+		case MouseButton::MASK_XBUTTON1:
+			return MouseButton::MB_XBUTTON1;
+		case MouseButton::MASK_XBUTTON2:
+			return MouseButton::MB_XBUTTON2;
 		default:
-			return MOUSE_BUTTON_NONE;
+			return MouseButton::NONE;
 	}
 }
 
 MouseButton AndroidInputHandler::_android_button_mask_to_godot_button_mask(int android_button_mask) {
-	MouseButton godot_button_mask = MOUSE_BUTTON_NONE;
+	MouseButton godot_button_mask = MouseButton::NONE;
 	if (android_button_mask & AMOTION_EVENT_BUTTON_PRIMARY) {
-		godot_button_mask |= MOUSE_BUTTON_MASK_LEFT;
+		godot_button_mask |= MouseButton::MASK_LEFT;
 	}
 	if (android_button_mask & AMOTION_EVENT_BUTTON_SECONDARY) {
-		godot_button_mask |= MOUSE_BUTTON_MASK_RIGHT;
+		godot_button_mask |= MouseButton::MASK_RIGHT;
 	}
 	if (android_button_mask & AMOTION_EVENT_BUTTON_TERTIARY) {
-		godot_button_mask |= MOUSE_BUTTON_MASK_MIDDLE;
+		godot_button_mask |= MouseButton::MASK_MIDDLE;
 	}
 	if (android_button_mask & AMOTION_EVENT_BUTTON_BACK) {
-		godot_button_mask |= MOUSE_BUTTON_MASK_XBUTTON1;
+		godot_button_mask |= MouseButton::MASK_XBUTTON1;
 	}
 	if (android_button_mask & AMOTION_EVENT_BUTTON_FORWARD) {
-		godot_button_mask |= MOUSE_BUTTON_MASK_XBUTTON2;
+		godot_button_mask |= MouseButton::MASK_XBUTTON2;
 	}
 
 	return godot_button_mask;
diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h
index 2918ca300b..e0b4196f14 100644
--- a/platform/android/android_input_handler.h
+++ b/platform/android/android_input_handler.h
@@ -53,10 +53,10 @@ public:
 	struct JoypadEvent {
 		int device = 0;
 		int type = 0;
-		int index = 0;
+		int index = 0; // Can be either JoyAxis or JoyButton.
 		bool pressed = false;
 		float value = 0;
-		int hat = 0;
+		HatMask hat = HatMask::CENTER;
 	};
 
 private:
@@ -65,7 +65,7 @@ private:
 	bool control_mem = false;
 	bool meta_mem = false;
 
-	MouseButton buttons_state = MOUSE_BUTTON_NONE;
+	MouseButton buttons_state = MouseButton::NONE;
 
 	Vector<TouchPos> touch;
 	Point2 hover_prev_pos; // needed to calculate the relative position on hover events
diff --git a/platform/android/android_keys_utils.cpp b/platform/android/android_keys_utils.cpp
index 5aa546c17b..0cea0589ce 100644
--- a/platform/android/android_keys_utils.cpp
+++ b/platform/android/android_keys_utils.cpp
@@ -30,12 +30,12 @@
 
 #include "android_keys_utils.h"
 
-unsigned int android_get_keysym(unsigned int p_code) {
-	for (int i = 0; _ak_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+Key android_get_keysym(unsigned int p_code) {
+	for (int i = 0; _ak_to_keycode[i].keysym != Key::UNKNOWN; i++) {
 		if (_ak_to_keycode[i].keycode == p_code) {
 			return _ak_to_keycode[i].keysym;
 		}
 	}
 
-	return KEY_UNKNOWN;
+	return Key::UNKNOWN;
 }
diff --git a/platform/android/android_keys_utils.h b/platform/android/android_keys_utils.h
index de6f48d33a..bac9bab6db 100644
--- a/platform/android/android_keys_utils.h
+++ b/platform/android/android_keys_utils.h
@@ -35,101 +35,101 @@
 #include <core/os/keyboard.h>
 
 struct _WinTranslatePair {
-	unsigned int keysym = 0;
+	Key keysym = Key::NONE;
 	unsigned int keycode = 0;
 };
 
 static _WinTranslatePair _ak_to_keycode[] = {
-	{ KEY_TAB, AKEYCODE_TAB },
-	{ KEY_ENTER, AKEYCODE_ENTER },
-	{ KEY_SHIFT, AKEYCODE_SHIFT_LEFT },
-	{ KEY_SHIFT, AKEYCODE_SHIFT_RIGHT },
-	{ KEY_ALT, AKEYCODE_ALT_LEFT },
-	{ KEY_ALT, AKEYCODE_ALT_RIGHT },
-	{ KEY_MENU, AKEYCODE_MENU },
-	{ KEY_PAUSE, AKEYCODE_MEDIA_PLAY_PAUSE },
-	{ KEY_ESCAPE, AKEYCODE_BACK },
-	{ KEY_SPACE, AKEYCODE_SPACE },
-	{ KEY_PAGEUP, AKEYCODE_PAGE_UP },
-	{ KEY_PAGEDOWN, AKEYCODE_PAGE_DOWN },
-	{ KEY_HOME, AKEYCODE_HOME }, //(0x24)
-	{ KEY_LEFT, AKEYCODE_DPAD_LEFT },
-	{ KEY_UP, AKEYCODE_DPAD_UP },
-	{ KEY_RIGHT, AKEYCODE_DPAD_RIGHT },
-	{ KEY_DOWN, AKEYCODE_DPAD_DOWN },
-	{ KEY_PERIODCENTERED, AKEYCODE_DPAD_CENTER },
-	{ KEY_BACKSPACE, AKEYCODE_DEL },
-	{ KEY_0, AKEYCODE_0 }, ////0 key
-	{ KEY_1, AKEYCODE_1 }, ////1 key
-	{ KEY_2, AKEYCODE_2 }, ////2 key
-	{ KEY_3, AKEYCODE_3 }, ////3 key
-	{ KEY_4, AKEYCODE_4 }, ////4 key
-	{ KEY_5, AKEYCODE_5 }, ////5 key
-	{ KEY_6, AKEYCODE_6 }, ////6 key
-	{ KEY_7, AKEYCODE_7 }, ////7 key
-	{ KEY_8, AKEYCODE_8 }, ////8 key
-	{ KEY_9, AKEYCODE_9 }, ////9 key
-	{ KEY_A, AKEYCODE_A }, ////A key
-	{ KEY_B, AKEYCODE_B }, ////B key
-	{ KEY_C, AKEYCODE_C }, ////C key
-	{ KEY_D, AKEYCODE_D }, ////D key
-	{ KEY_E, AKEYCODE_E }, ////E key
-	{ KEY_F, AKEYCODE_F }, ////F key
-	{ KEY_G, AKEYCODE_G }, ////G key
-	{ KEY_H, AKEYCODE_H }, ////H key
-	{ KEY_I, AKEYCODE_I }, ////I key
-	{ KEY_J, AKEYCODE_J }, ////J key
-	{ KEY_K, AKEYCODE_K }, ////K key
-	{ KEY_L, AKEYCODE_L }, ////L key
-	{ KEY_M, AKEYCODE_M }, ////M key
-	{ KEY_N, AKEYCODE_N }, ////N key
-	{ KEY_O, AKEYCODE_O }, ////O key
-	{ KEY_P, AKEYCODE_P }, ////P key
-	{ KEY_Q, AKEYCODE_Q }, ////Q key
-	{ KEY_R, AKEYCODE_R }, ////R key
-	{ KEY_S, AKEYCODE_S }, ////S key
-	{ KEY_T, AKEYCODE_T }, ////T key
-	{ KEY_U, AKEYCODE_U }, ////U key
-	{ KEY_V, AKEYCODE_V }, ////V key
-	{ KEY_W, AKEYCODE_W }, ////W key
-	{ KEY_X, AKEYCODE_X }, ////X key
-	{ KEY_Y, AKEYCODE_Y }, ////Y key
-	{ KEY_Z, AKEYCODE_Z }, ////Z key
-	{ KEY_HOMEPAGE, AKEYCODE_EXPLORER },
-	{ KEY_LAUNCH0, AKEYCODE_BUTTON_A },
-	{ KEY_LAUNCH1, AKEYCODE_BUTTON_B },
-	{ KEY_LAUNCH2, AKEYCODE_BUTTON_C },
-	{ KEY_LAUNCH3, AKEYCODE_BUTTON_X },
-	{ KEY_LAUNCH4, AKEYCODE_BUTTON_Y },
-	{ KEY_LAUNCH5, AKEYCODE_BUTTON_Z },
-	{ KEY_LAUNCH6, AKEYCODE_BUTTON_L1 },
-	{ KEY_LAUNCH7, AKEYCODE_BUTTON_R1 },
-	{ KEY_LAUNCH8, AKEYCODE_BUTTON_L2 },
-	{ KEY_LAUNCH9, AKEYCODE_BUTTON_R2 },
-	{ KEY_LAUNCHA, AKEYCODE_BUTTON_THUMBL },
-	{ KEY_LAUNCHB, AKEYCODE_BUTTON_THUMBR },
-	{ KEY_LAUNCHC, AKEYCODE_BUTTON_START },
-	{ KEY_LAUNCHD, AKEYCODE_BUTTON_SELECT },
-	{ KEY_LAUNCHE, AKEYCODE_BUTTON_MODE },
-	{ KEY_VOLUMEMUTE, AKEYCODE_MUTE },
-	{ KEY_VOLUMEDOWN, AKEYCODE_VOLUME_DOWN },
-	{ KEY_VOLUMEUP, AKEYCODE_VOLUME_UP },
-	{ KEY_BACK, AKEYCODE_MEDIA_REWIND },
-	{ KEY_FORWARD, AKEYCODE_MEDIA_FAST_FORWARD },
-	{ KEY_MEDIANEXT, AKEYCODE_MEDIA_NEXT },
-	{ KEY_MEDIAPREVIOUS, AKEYCODE_MEDIA_PREVIOUS },
-	{ KEY_MEDIASTOP, AKEYCODE_MEDIA_STOP },
-	{ KEY_PLUS, AKEYCODE_PLUS },
-	{ KEY_EQUAL, AKEYCODE_EQUALS }, // the '+' key
-	{ KEY_COMMA, AKEYCODE_COMMA }, // the ',' key
-	{ KEY_MINUS, AKEYCODE_MINUS }, // the '-' key
-	{ KEY_SLASH, AKEYCODE_SLASH }, // the '/?' key
-	{ KEY_BACKSLASH, AKEYCODE_BACKSLASH },
-	{ KEY_BRACKETLEFT, AKEYCODE_LEFT_BRACKET },
-	{ KEY_BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET },
-	{ KEY_CTRL, AKEYCODE_CTRL_LEFT },
-	{ KEY_CTRL, AKEYCODE_CTRL_RIGHT },
-	{ KEY_UNKNOWN, 0 }
+	{ Key::TAB, AKEYCODE_TAB },
+	{ Key::ENTER, AKEYCODE_ENTER },
+	{ Key::SHIFT, AKEYCODE_SHIFT_LEFT },
+	{ Key::SHIFT, AKEYCODE_SHIFT_RIGHT },
+	{ Key::ALT, AKEYCODE_ALT_LEFT },
+	{ Key::ALT, AKEYCODE_ALT_RIGHT },
+	{ Key::MENU, AKEYCODE_MENU },
+	{ Key::PAUSE, AKEYCODE_MEDIA_PLAY_PAUSE },
+	{ Key::ESCAPE, AKEYCODE_BACK },
+	{ Key::SPACE, AKEYCODE_SPACE },
+	{ Key::PAGEUP, AKEYCODE_PAGE_UP },
+	{ Key::PAGEDOWN, AKEYCODE_PAGE_DOWN },
+	{ Key::HOME, AKEYCODE_HOME }, //(0x24)
+	{ Key::LEFT, AKEYCODE_DPAD_LEFT },
+	{ Key::UP, AKEYCODE_DPAD_UP },
+	{ Key::RIGHT, AKEYCODE_DPAD_RIGHT },
+	{ Key::DOWN, AKEYCODE_DPAD_DOWN },
+	{ Key::PERIODCENTERED, AKEYCODE_DPAD_CENTER },
+	{ Key::BACKSPACE, AKEYCODE_DEL },
+	{ Key::KEY_0, AKEYCODE_0 },
+	{ Key::KEY_1, AKEYCODE_1 },
+	{ Key::KEY_2, AKEYCODE_2 },
+	{ Key::KEY_3, AKEYCODE_3 },
+	{ Key::KEY_4, AKEYCODE_4 },
+	{ Key::KEY_5, AKEYCODE_5 },
+	{ Key::KEY_6, AKEYCODE_6 },
+	{ Key::KEY_7, AKEYCODE_7 },
+	{ Key::KEY_8, AKEYCODE_8 },
+	{ Key::KEY_9, AKEYCODE_9 },
+	{ Key::A, AKEYCODE_A },
+	{ Key::B, AKEYCODE_B },
+	{ Key::C, AKEYCODE_C },
+	{ Key::D, AKEYCODE_D },
+	{ Key::E, AKEYCODE_E },
+	{ Key::F, AKEYCODE_F },
+	{ Key::G, AKEYCODE_G },
+	{ Key::H, AKEYCODE_H },
+	{ Key::I, AKEYCODE_I },
+	{ Key::J, AKEYCODE_J },
+	{ Key::K, AKEYCODE_K },
+	{ Key::L, AKEYCODE_L },
+	{ Key::M, AKEYCODE_M },
+	{ Key::N, AKEYCODE_N },
+	{ Key::O, AKEYCODE_O },
+	{ Key::P, AKEYCODE_P },
+	{ Key::Q, AKEYCODE_Q },
+	{ Key::R, AKEYCODE_R },
+	{ Key::S, AKEYCODE_S },
+	{ Key::T, AKEYCODE_T },
+	{ Key::U, AKEYCODE_U },
+	{ Key::V, AKEYCODE_V },
+	{ Key::W, AKEYCODE_W },
+	{ Key::X, AKEYCODE_X },
+	{ Key::Y, AKEYCODE_Y },
+	{ Key::Z, AKEYCODE_Z },
+	{ Key::HOMEPAGE, AKEYCODE_EXPLORER },
+	{ Key::LAUNCH0, AKEYCODE_BUTTON_A },
+	{ Key::LAUNCH1, AKEYCODE_BUTTON_B },
+	{ Key::LAUNCH2, AKEYCODE_BUTTON_C },
+	{ Key::LAUNCH3, AKEYCODE_BUTTON_X },
+	{ Key::LAUNCH4, AKEYCODE_BUTTON_Y },
+	{ Key::LAUNCH5, AKEYCODE_BUTTON_Z },
+	{ Key::LAUNCH6, AKEYCODE_BUTTON_L1 },
+	{ Key::LAUNCH7, AKEYCODE_BUTTON_R1 },
+	{ Key::LAUNCH8, AKEYCODE_BUTTON_L2 },
+	{ Key::LAUNCH9, AKEYCODE_BUTTON_R2 },
+	{ Key::LAUNCHA, AKEYCODE_BUTTON_THUMBL },
+	{ Key::LAUNCHB, AKEYCODE_BUTTON_THUMBR },
+	{ Key::LAUNCHC, AKEYCODE_BUTTON_START },
+	{ Key::LAUNCHD, AKEYCODE_BUTTON_SELECT },
+	{ Key::LAUNCHE, AKEYCODE_BUTTON_MODE },
+	{ Key::VOLUMEMUTE, AKEYCODE_MUTE },
+	{ Key::VOLUMEDOWN, AKEYCODE_VOLUME_DOWN },
+	{ Key::VOLUMEUP, AKEYCODE_VOLUME_UP },
+	{ Key::BACK, AKEYCODE_MEDIA_REWIND },
+	{ Key::FORWARD, AKEYCODE_MEDIA_FAST_FORWARD },
+	{ Key::MEDIANEXT, AKEYCODE_MEDIA_NEXT },
+	{ Key::MEDIAPREVIOUS, AKEYCODE_MEDIA_PREVIOUS },
+	{ Key::MEDIASTOP, AKEYCODE_MEDIA_STOP },
+	{ Key::PLUS, AKEYCODE_PLUS },
+	{ Key::EQUAL, AKEYCODE_EQUALS }, // the '+' key
+	{ Key::COMMA, AKEYCODE_COMMA }, // the ',' key
+	{ Key::MINUS, AKEYCODE_MINUS }, // the '-' key
+	{ Key::SLASH, AKEYCODE_SLASH }, // the '/?' key
+	{ Key::BACKSLASH, AKEYCODE_BACKSLASH },
+	{ Key::BRACKETLEFT, AKEYCODE_LEFT_BRACKET },
+	{ Key::BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET },
+	{ Key::CTRL, AKEYCODE_CTRL_LEFT },
+	{ Key::CTRL, AKEYCODE_CTRL_RIGHT },
+	{ Key::UNKNOWN, 0 }
 };
 /*
 TODO: map these android key:
@@ -157,6 +157,6 @@ TODO: map these android key:
 	AKEYCODE_SWITCH_CHARSET  = 95,
 */
 
-unsigned int android_get_keysym(unsigned int p_code);
+Key android_get_keysym(unsigned int p_code);
 
 #endif // ANDROID_KEYS_UTILS_H
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp
index c7f19e4be2..3236512f5c 100644
--- a/platform/android/java_godot_lib_jni.cpp
+++ b/platform/android/java_godot_lib_jni.cpp
@@ -317,8 +317,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env
 
 // Called on the UI thread
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) {
-	if (step.get() <= 0)
+	if (step.get() <= 0) {
 		return;
+	}
 
 	AndroidInputHandler::JoypadEvent jevent;
 	jevent.device = p_device;
@@ -331,24 +332,27 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env,
 
 // Called on the UI thread
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) {
-	if (step.get() <= 0)
+	if (step.get() <= 0) {
 		return;
+	}
 
 	AndroidInputHandler::JoypadEvent jevent;
 	jevent.device = p_device;
 	jevent.type = AndroidInputHandler::JOY_EVENT_HAT;
-	int hat = 0;
+	HatMask hat = HatMask::CENTER;
 	if (p_hat_x != 0) {
-		if (p_hat_x < 0)
-			hat |= HatMask::HAT_MASK_LEFT;
-		else
-			hat |= HatMask::HAT_MASK_RIGHT;
+		if (p_hat_x < 0) {
+			hat |= HatMask::LEFT;
+		} else {
+			hat |= HatMask::RIGHT;
+		}
 	}
 	if (p_hat_y != 0) {
-		if (p_hat_y < 0)
-			hat |= HatMask::HAT_MASK_UP;
-		else
-			hat |= HatMask::HAT_MASK_DOWN;
+		if (p_hat_y < 0) {
+			hat |= HatMask::UP;
+		} else {
+			hat |= HatMask::DOWN;
+		}
 	}
 	jevent.hat = hat;