summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r--apps/gui/skin_engine/skin_engine.h4
-rw-r--r--apps/gui/skin_engine/skin_touchsupport.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index a685f4f072..b56674112c 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -40,12 +40,10 @@ enum skinnable_screens {
40 40
41struct skin_stats; 41struct skin_stats;
42struct skin_viewport; 42struct skin_viewport;
43struct touchregion;
44struct wps_data; 43struct wps_data;
45 44
46#ifdef HAVE_TOUCHSCREEN 45#ifdef HAVE_TOUCHSCREEN
47int skin_get_touchaction(struct wps_data *data, int* edge_offset, 46int skin_get_touchaction(struct wps_data *data, int* edge_offset);
48 struct touchregion **retregion);
49void skin_disarm_touchregions(struct wps_data *data); 47void skin_disarm_touchregions(struct wps_data *data);
50#endif 48#endif
51 49
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 045bc809c8..eba6b82f5b 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -52,8 +52,7 @@ void skin_disarm_touchregions(struct wps_data *data)
52 * egde_offset is a percentage value for the position of the touch 52 * egde_offset is a percentage value for the position of the touch
53 * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type. 53 * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type.
54 */ 54 */
55int skin_get_touchaction(struct wps_data *data, int* edge_offset, 55int skin_get_touchaction(struct wps_data *data, int* edge_offset)
56 struct touchregion **retregion)
57{ 56{
58 int returncode = ACTION_NONE; 57 int returncode = ACTION_NONE;
59 short x,y; 58 short x,y;
@@ -163,8 +162,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset,
163 /* On release, all regions are disarmed. */ 162 /* On release, all regions are disarmed. */
164 if (released) 163 if (released)
165 skin_disarm_touchregions(data); 164 skin_disarm_touchregions(data);
166 if (retregion && temp)
167 *retregion = temp;
168 if (temp && temp->press_length == LONG_PRESS) 165 if (temp && temp->press_length == LONG_PRESS)
169 temp->armed = false; 166 temp->armed = false;
170 167