Do the same with KeyInputFlags. Fix minor UI misalignments

This commit is contained in:
Henrik Rydgård committed 2025-12-19 13:41:58 +01:00
1 parent 481d0fd18c
commit 18a67b82d2
37 files changed
+183 -182

No files matched your search

+6 -6
View File
@@ -261,7 +261,7 @@ void DinputDevice::ApplyButtons(DIJOYSTATE2 &state) {
bool down = (state.rgbButtons[i] & downMask) == downMask;
KeyInput key;
key.deviceId = DEVICE_ID_PAD_0 + pDevNum;
key.flags = down ? KEY_DOWN : KEY_UP;
key.flags = down ? KeyInputFlags::DOWN : KeyInputFlags::UP;
key.keyCode = dinput_buttons[i];
NativeKey(key);
@@ -273,7 +273,7 @@ void DinputDevice::ApplyButtons(DIJOYSTATE2 &state) {
KeyInput dpad[4]{};
for (int i = 0; i < 4; ++i) {
dpad[i].deviceId = DEVICE_ID_PAD_0 + pDevNum;
dpad[i].flags = KEY_UP;
dpad[i].flags = KeyInputFlags::UP;
}
dpad[0].keyCode = NKCODE_DPAD_UP;
dpad[1].keyCode = NKCODE_DPAD_LEFT;
@@ -283,16 +283,16 @@ void DinputDevice::ApplyButtons(DIJOYSTATE2 &state) {
if (LOWORD(state.rgdwPOV[0]) != JOY_POVCENTERED) {
// These are the edges, so we use or.
if (state.rgdwPOV[0] >= JOY_POVLEFT_FORWARD || state.rgdwPOV[0] <= JOY_POVFORWARD_RIGHT) {
dpad[0].flags = KEY_DOWN;
dpad[0].flags = KeyInputFlags::DOWN;
}
if (state.rgdwPOV[0] >= JOY_POVBACKWARD_LEFT && state.rgdwPOV[0] <= JOY_POVLEFT_FORWARD) {
dpad[1].flags = KEY_DOWN;
dpad[1].flags = KeyInputFlags::DOWN;
}
if (state.rgdwPOV[0] >= JOY_POVRIGHT_BACKWARD && state.rgdwPOV[0] <= JOY_POVBACKWARD_LEFT) {
dpad[2].flags = KEY_DOWN;
dpad[2].flags = KeyInputFlags::DOWN;
}
if (state.rgdwPOV[0] >= JOY_POVFORWARD_RIGHT && state.rgdwPOV[0] <= JOY_POVRIGHT_BACKWARD) {
dpad[3].flags = KEY_DOWN;
dpad[3].flags = KeyInputFlags::DOWN;
}
}