Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-28 15:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix : show correct current button character

Browse Source
This commit is contained in:
Aaron Culliney 2015-09-04 20:35:42 -07:00
parent 5b59e1c0c0
commit 75ecc47307
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/gltouchjoy.c
View File

@ -667,6 +667,8 @@ static void gltouchjoy_setTouchButtonTypes(
currButtonDisplayChar = MOUSETEXT_CLOSEDAPPLE; currButtonDisplayChar = MOUSETEXT_CLOSEDAPPLE;
} else if (touchDownChar == TOUCH_BOTH) { } else if (touchDownChar == TOUCH_BOTH) {
currButtonDisplayChar = '+'; currButtonDisplayChar = '+';
} else if (touchDownScancode < 0) {
currButtonDisplayChar = ' ';
} }
_setup_button_object_with_char(currButtonDisplayChar); _setup_button_object_with_char(currButtonDisplayChar);
} }

5
src/video/gltouchjoy_kpad.c
View File

@ -157,10 +157,6 @@ static void touchkpad_keyboardReadCallback(void) {
} }
} }
if (fired == REPEAT_BUTTON) {
kpad.buttonDrawCallback(kpad.currButtonDisplayChar);
}
bool lockedAxis = _callback_sourceTryLock(&kpad.axisLock); bool lockedAxis = _callback_sourceTryLock(&kpad.axisLock);
if (lockedAxis) { if (lockedAxis) {
if (fired == REPEAT_AXIS || fired == REPEAT_AXIS_ALT) { if (fired == REPEAT_AXIS || fired == REPEAT_AXIS_ALT) {
@ -427,6 +423,7 @@ static void _set_current_button_state(touchjoy_button_type_t theButtonChar, int
kpad.currButtonDisplayChar = ' '; kpad.currButtonDisplayChar = ' ';
kpad.scancodes[REPEAT_BUTTON] = -1; kpad.scancodes[REPEAT_BUTTON] = -1;
} }
kpad.buttonDrawCallback(kpad.currButtonDisplayChar);
} }
static void touchkpad_buttonDown(void) { static void touchkpad_buttonDown(void) {