Mercurial > repos > blastem

comparison nuklear_ui/blastem_nuklear.c @ 1807:a218c253fcb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed contents of left and right shoulder boxes for VARIANT_6B_BUMPER controllers
author Michael Pavone <pavone@retrodev.com>
date Tue, 26 Mar 2019 23:55:41 -0700
parents 396369ab481a
children af14c21939f6
comparison
equal deleted inserted replaced
1806:396369ab481a 1807:a218c253fcb3
1055 } 1055 }
1056 1056
1057 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width, 1057 binding_box(context, bindings, "Right Shoulder", bind_box_left, font->height/2, bind_box_width,
1058 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2, 1058 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
1059 (int[]){ 1059 (int[]){
1060 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSHOULDER : SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, 1060 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSHOULDER : AXIS | SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
1061 AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT 1061 AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT
1062 }); 1062 });
1063 1063
1064 binding_box(context, bindings, "Misc Buttons", (render_width() - bind_box_width) / 2, font->height/2, bind_box_width, 3, (int[]){ 1064 binding_box(context, bindings, "Misc Buttons", (render_width() - bind_box_width) / 2, font->height/2, bind_box_width, 3, (int[]){
1065 SDL_CONTROLLER_BUTTON_BACK, 1065 SDL_CONTROLLER_BUTTON_BACK,
1097 } 1097 }
1098 1098
1099 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width, 1099 binding_box(context, bindings, "Left Shoulder", bind_box_left, font->height/2, bind_box_width,
1100 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2, 1100 selected_controller_info.variant == VARIANT_6B_BUMPERS ? 1 : 2,
1101 (int[]){ 1101 (int[]){
1102 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSTICK : SDL_CONTROLLER_BUTTON_LEFTSHOULDER, 1102 selected_controller_info.variant == VARIANT_6B_RIGHT ? SDL_CONTROLLER_BUTTON_LEFTSTICK : AXIS | SDL_CONTROLLER_AXIS_TRIGGERLEFT,
1103 SDL_CONTROLLER_BUTTON_RIGHTSTICK 1103 SDL_CONTROLLER_BUTTON_RIGHTSTICK
1104 }); 1104 });
1105 1105
1106 binding_box(context, bindings, "D-pad", dpad_left, dpad_top, bind_box_width, 4, (int[]){ 1106 binding_box(context, bindings, "D-pad", dpad_left, dpad_top, bind_box_width, 4, (int[]){
1107 SDL_CONTROLLER_BUTTON_DPAD_UP, 1107 SDL_CONTROLLER_BUTTON_DPAD_UP,