Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Allow sliders to be controller with A button and d pad

Browse source
This commit is contained in:
James Lambert 2023-11-07 20:18:32 -07:00
parent 7e42aa1746
commit 820e2e274d
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/menu/menu_builder.c
View file

@ -119,7 +119,7 @@ enum MenuDirection sliderMenuItemUpdate(struct MenuBuilderElement* element, Menu
int currentValue = (int)floorf(slider->value * (numTicks - 1));
int newValue = currentValue;
if (controllerDir & ControllerDirectionRight) {
if ((controllerDir & ControllerDirectionRight) || controllerGetButtonDown(0, A_BUTTON)) {
++newValue;
} else if (controllerDir & ControllerDirectionLeft) {
--newValue;
@ -127,8 +127,12 @@ enum MenuDirection sliderMenuItemUpdate(struct MenuBuilderElement* element, Menu
if (newValue < 0) {
newValue = 0;
} else if (newValue >= numTicks) {
newValue = numTicks - 1;
} else if (newValue > numTicks - 1) {
if (controllerGetButtonDown(0, A_BUTTON)) {
newValue = 0;
} else {
newValue = numTicks - 1;
}
}
if (newValue != currentValue) {
@ -154,6 +158,34 @@ enum MenuDirection sliderMenuItemUpdate(struct MenuBuilderElement* element, Menu
newValue = 0.0f;
}
int numTicks = element->params->params.slider.numberOfTicks;
if (controllerGetButtonDown(0, R_JPAD | A_BUTTON)) {
int currentValue = (int)floorf(newValue * (numTicks - 1));
currentValue = currentValue + 1;
if (currentValue > numTicks - 1) {
if (controllerGetButtonDown(0, A_BUTTON)) {
currentValue = 0;
} else {
currentValue = numTicks - 1;
}
}
newValue = (float)currentValue / (float)(numTicks - 1);
} else if (controllerGetButtonDown(0, L_JPAD)) {
int currentValue = (int)ceilf(newValue * (numTicks - 1));
currentValue = currentValue - 1;
if (currentValue < 0) {
currentValue = 0;
}
newValue = (float)currentValue / (float)(numTicks - 1);
}
if (newValue != slider->value) {
struct MenuAction action;
action.type = MenuElementTypeSlider;