summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorhondres <liu.gam3@gmail.com>2016-02-03 00:15:50 +0100
committerhondres <liu.gam3@gmail.com>2016-02-03 00:15:50 +0100
commit1395029d8a1ed72806a103180a7ffca30fdb4aa0 (patch)
tree09c287cc1cbce3061cf78d0fa9df10603e5e16c9 /tools/editor
parenta9412b8744a570db96d08747321e45347790801f (diff)
fix joystick axis names in project settings
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/project_settings.cpp23
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 879eb4227c..9fe9b60ee5 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -299,18 +299,18 @@ void ProjectSettings::_add_item(int p_item){
device_id->set_val(0);
device_index_label->set_text("Joy Button Axis:");
device_index->clear();
- for(int i=0;i<24;i++) {
+ for(int i=0;i<JOY_AXIS_MAX*2;i++) {
String desc;
int ax=i/2;
- if (ax==0)
+ if (ax==0 || ax==1)
desc=" (Left Stick)";
- else if (ax==1)
+ else if (ax==2 || ax==3)
desc=" (Right Stick)";
- else if (ax==4)
+ else if (ax==6)
desc=" (L2)";
- else if (ax==5)
+ else if (ax==7)
desc=" (R2)";
@@ -511,7 +511,18 @@ void ProjectSettings::_update_actions() {
} break;
case InputEvent::JOYSTICK_MOTION: {
- String str = "Device "+itos(ie.device)+", Axis "+itos(ie.joy_motion.axis)+" "+(ie.joy_motion.axis_value<0?"-.":"+.");
+ String desc;
+ int ax = ie.joy_motion.axis;
+
+ if (ax==0 || ax==1)
+ desc=" (Left Stick).";
+ else if (ax==2 || ax==3)
+ desc=" (Right Stick).";
+ else if (ax==6)
+ desc=" (L2).";
+ else if (ax==7)
+ desc=" (R2).";
+ String str = "Device "+itos(ie.device)+", Axis "+itos(ie.joy_motion.axis)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc;
action->set_text(0,str);
action->set_icon(0,get_icon("JoyAxis","EditorIcons"));
} break;