summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-23 12:17:15 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-23 13:01:28 +0100
commit920d2bfdfa582b81b0e47d8a0a5de5817289c6dc (patch)
tree97a850c3192afb9c51efb6194b7e5c08c000fd0c /core
parentff122a7e1fe4e061e564978450ee8bf442247a36 (diff)
Add two new default actions ui_end, ui_home
Used by Slider and Scrollbar
Diffstat (limited to 'core')
-rw-r--r--core/input_map.cpp10
-rw-r--r--core/project_settings.cpp14
2 files changed, 24 insertions, 0 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp
index a9ea1d9545..bd03d61196 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -282,6 +282,16 @@ void InputMap::load_default() {
key->set_scancode(KEY_PAGEDOWN);
action_add_event("ui_page_down", key);
+ add_action("ui_home");
+ key.instance();
+ key->set_scancode(KEY_HOME);
+ action_add_event("ui_home", key);
+
+ add_action("ui_end");
+ key.instance();
+ key->set_scancode(KEY_END);
+ action_add_event("ui_end", key);
+
//set("display/window/handheld/orientation", "landscape");
}
diff --git a/core/project_settings.cpp b/core/project_settings.cpp
index 427fa77e62..22cc592697 100644
--- a/core/project_settings.cpp
+++ b/core/project_settings.cpp
@@ -1027,6 +1027,20 @@ ProjectSettings::ProjectSettings() {
GLOBAL_DEF("input/ui_page_down", va);
input_presets.push_back("input/ui_page_down");
+ va = Array();
+ key.instance();
+ key->set_scancode(KEY_HOME);
+ va.push_back(key);
+ GLOBAL_DEF("input/ui_home", va);
+ input_presets.push_back("input/ui_home");
+
+ va = Array();
+ key.instance();
+ key->set_scancode(KEY_END);
+ va.push_back(key);
+ GLOBAL_DEF("input/ui_end", va);
+ input_presets.push_back("input/ui_end");
+
//GLOBAL_DEF("display/window/handheld/orientation", "landscape");
custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::STRING, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "landscape,portrait,reverse_landscape,reverse_portrait,sensor_landscape,sensor_portrait,sensor");