1 files changed, 28 insertions, 49 deletions

diff --git a/scene/gui/input_action.cpp b/scene/gui/input_action.cpp
index 5b0333828..311cb4ab1 100644
--- a/scene/gui/input_action.cpp
+++ b/scene/gui/input_action.cpp
@@ -30,95 +30,73 @@
 #include "input_action.h"
 #include "os/keyboard.h"
 
-void ShortCut::set_shortcut(const InputEvent &p_shortcut) {
+void ShortCut::set_shortcut(const Ref<InputEvent> &p_shortcut) {
 
 	shortcut = p_shortcut;
 	emit_changed();
 }
 
-InputEvent ShortCut::get_shortcut() const {
+Ref<InputEvent> ShortCut::get_shortcut() const {
 
 	return shortcut;
 }
 
-bool ShortCut::is_shortcut(const InputEvent &p_event) const {
+bool ShortCut::is_shortcut(const Ref<InputEvent> &p_event) const {
 
-	bool same = false;
-
-	switch (p_event.type) {
-
-		case InputEvent::KEY: {
-
-			same = (shortcut.key.scancode == p_event.key.scancode && shortcut.key.mod == p_event.key.mod);
-
-		} break;
-		case InputEvent::JOYPAD_BUTTON: {
-
-			same = (shortcut.joy_button.button_index == p_event.joy_button.button_index);
-
-		} break;
-		case InputEvent::MOUSE_BUTTON: {
-
-			same = (shortcut.mouse_button.button_index == p_event.mouse_button.button_index);
-
-		} break;
-		case InputEvent::JOYPAD_MOTION: {
-
-			same = (shortcut.joy_motion.axis == p_event.joy_motion.axis && (shortcut.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0));
-
-		} break;
-		default: {};
-	}
-
-	return same;
+	return shortcut.is_valid() && shortcut->action_match(p_event);
 }
 
 String ShortCut::get_as_text() const {
 
+	if (shortcut.is_valid())
+		return shortcut->as_text();
+	else
+		return "None";
+#if 0
 	switch (shortcut.type) {
 
-		case InputEvent::NONE: {
+		case Ref<InputEvent>::NONE: {
 
 			return "None";
 		} break;
-		case InputEvent::KEY: {
+		case Ref<InputEvent>::KEY: {
 
 			String str;
-			if (shortcut.key.mod.shift)
+			if (shortcut->get_shift())
 				str += RTR("Shift+");
-			if (shortcut.key.mod.alt)
+			if (shortcut->get_alt())
 				str += RTR("Alt+");
-			if (shortcut.key.mod.control)
+			if (shortcut->get_control())
 				str += RTR("Ctrl+");
-			if (shortcut.key.mod.meta)
+			if (shortcut->get_metakey())
 				str += RTR("Meta+");
 
-			str += keycode_get_string(shortcut.key.scancode).capitalize();
+			str += keycode_get_string(shortcut->get_scancode()).capitalize();
 
 			return str;
 		} break;
-		case InputEvent::JOYPAD_BUTTON: {
+		case Ref<InputEvent>::JOYPAD_BUTTON: {
 
-			String str = RTR("Device") + " " + itos(shortcut.device) + ", " + RTR("Button") + " " + itos(shortcut.joy_button.button_index);
+			String str = RTR("Device") + " " + itos(shortcut.device) + ", " + RTR("Button") + " " + itos(shortcut.joy_button->get_button_index());
 			str += ".";
 
 			return str;
 		} break;
-		case InputEvent::MOUSE_BUTTON: {
+		case Ref<InputEvent>::MOUSE_BUTTON: {
 
 			String str = RTR("Device") + " " + itos(shortcut.device) + ", ";
-			switch (shortcut.mouse_button.button_index) {
+			switch (shortcut->get_button_index()) {
 				case BUTTON_LEFT: str += RTR("Left Button."); break;
 				case BUTTON_RIGHT: str += RTR("Right Button."); break;
 				case BUTTON_MIDDLE: str += RTR("Middle Button."); break;
 				case BUTTON_WHEEL_UP: str += RTR("Wheel Up."); break;
 				case BUTTON_WHEEL_DOWN: str += RTR("Wheel Down."); break;
-				default: str += RTR("Button") + " " + itos(shortcut.mouse_button.button_index) + ".";
+				default: str += RTR("Button") + " " + itos(shortcut->get_button_index()) + ".";
 			}
 
 			return str;
 		} break;
-		case InputEvent::JOYPAD_MOTION: {
+		case Ref<InputEvent>::JOYPAD_MOTION: {
 
 			int ax = shortcut.joy_motion.axis;
 			String str = RTR("Device") + " " + itos(shortcut.device) + ", " + RTR("Axis") + " " + itos(ax) + ".";
@@ -128,24 +106,25 @@ String ShortCut::get_as_text() const {
 	}
 
 	return "";
+#endif
 }
 
 bool ShortCut::is_valid() const {
 
-	return shortcut.type != InputEvent::NONE;
+	return shortcut.is_valid();
 }
 
 void ShortCut::_bind_methods() {
 
-	ClassDB::bind_method(D_METHOD("set_shortcut", "event"), &ShortCut::set_shortcut);
-	ClassDB::bind_method(D_METHOD("get_shortcut"), &ShortCut::get_shortcut);
+	ClassDB::bind_method(D_METHOD("set_shortcut", "event:InputEvent"), &ShortCut::set_shortcut);
+	ClassDB::bind_method(D_METHOD("get_shortcut:InputEvent"), &ShortCut::get_shortcut);
 
 	ClassDB::bind_method(D_METHOD("is_valid"), &ShortCut::is_valid);
 
-	ClassDB::bind_method(D_METHOD("is_shortcut", "event"), &ShortCut::is_shortcut);
+	ClassDB::bind_method(D_METHOD("is_shortcut", "event:InputEvent"), &ShortCut::is_shortcut);
 	ClassDB::bind_method(D_METHOD("get_as_text"), &ShortCut::get_as_text);
 
-	ADD_PROPERTY(PropertyInfo(Variant::INPUT_EVENT, "shortcut"), "set_shortcut", "get_shortcut");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"), "set_shortcut", "get_shortcut");
 }
 
 ShortCut::ShortCut() {