projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0059c96
)
fixed bug with not undrawing virtual buttons when moving finger away
author
Holger Schemel
<info@artsoft.org>
Sun, 10 Feb 2019 20:01:01 +0000
(21:01 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sun, 10 Feb 2019 20:01:49 +0000
(21:01 +0100)
src/events.c
patch
|
blob
|
history
diff --git
a/src/events.c
b/src/events.c
index ee5e492c93c0d94f786af2d20e3a239a92ae2b82..0fa609aa4b8146850fe1bb10c1fba0e3ca6156fd 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-686,6
+686,7
@@
static struct
SDL_FingerID finger_id;
int counter;
Key key;
SDL_FingerID finger_id;
int counter;
Key key;
+ byte action;
} touch_info[NUM_TOUCH_FINGERS];
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
} touch_info[NUM_TOUCH_FINGERS];
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
@@
-814,6
+815,9
@@
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
{
HandleKey(touch_info[i].key, KEY_RELEASED);
{
HandleKey(touch_info[i].key, KEY_RELEASED);
+ // undraw previous grid button when moving finger away
+ overlay.grid_button_action &= ~touch_info[i].action;
+
Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
}
Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
}
@@
-831,6
+835,7
@@
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
touch_info[i].finger_id = event->fingerId;
touch_info[i].counter = Counter();
touch_info[i].key = key;
touch_info[i].finger_id = event->fingerId;
touch_info[i].counter = Counter();
touch_info[i].key = key;
+ touch_info[i].action = grid_button_action;
}
else
{
}
else
{
@@
-846,6
+851,7
@@
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
touch_info[i].finger_id = 0;
touch_info[i].counter = 0;
touch_info[i].key = 0;
touch_info[i].finger_id = 0;
touch_info[i].counter = 0;
touch_info[i].key = 0;
+ touch_info[i].action = JOY_NO_ACTION;
}
}
}
}
}
}