summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine/skin_touchsupport.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/skin_engine/skin_touchsupport.c')
-rw-r--r--apps/gui/skin_engine/skin_touchsupport.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index eba6b82f5b..77ab30d675 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -35,8 +35,9 @@
35#include "dsp_misc.h" 35#include "dsp_misc.h"
36 36
37/** Disarms all touchregions. */ 37/** Disarms all touchregions. */
38void skin_disarm_touchregions(struct wps_data *data) 38void skin_disarm_touchregions(struct gui_wps *gwps)
39{ 39{
40 struct wps_data *data = gwps->data;
40 char* skin_buffer = get_skin_buffer(data); 41 char* skin_buffer = get_skin_buffer(data);
41 struct skin_token_list *regions = SKINOFFSETTOPTR(skin_buffer, data->touchregions); 42 struct skin_token_list *regions = SKINOFFSETTOPTR(skin_buffer, data->touchregions);
42 while (regions) 43 while (regions)
@@ -52,8 +53,9 @@ void skin_disarm_touchregions(struct wps_data *data)
52 * egde_offset is a percentage value for the position of the touch 53 * egde_offset is a percentage value for the position of the touch
53 * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type. 54 * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type.
54 */ 55 */
55int skin_get_touchaction(struct wps_data *data, int* edge_offset) 56int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
56{ 57{
58 struct wps_data *data = gwps->data;
57 int returncode = ACTION_NONE; 59 int returncode = ACTION_NONE;
58 short x,y; 60 short x,y;
59 short vx, vy; 61 short vx, vy;
@@ -161,7 +163,7 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset)
161 163
162 /* On release, all regions are disarmed. */ 164 /* On release, all regions are disarmed. */
163 if (released) 165 if (released)
164 skin_disarm_touchregions(data); 166 skin_disarm_touchregions(gwps);
165 if (temp && temp->press_length == LONG_PRESS) 167 if (temp && temp->press_length == LONG_PRESS)
166 temp->armed = false; 168 temp->armed = false;
167 169