From 06f046515865519d01464f7ba08259cbaba441bf Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Tue, 4 Oct 2022 23:06:34 +0100 Subject: skin engine: Remove touchregion argument from skin_get_touchaction Nobody uses the argument, and it exposes internals unnecessarily. Change-Id: I376dc75db99ed89671175f906980526a23be70f6 --- apps/gui/skin_engine/skin_engine.h | 4 +--- apps/gui/skin_engine/skin_touchsupport.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'apps/gui/skin_engine') 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 { struct skin_stats; struct skin_viewport; -struct touchregion; struct wps_data; #ifdef HAVE_TOUCHSCREEN -int skin_get_touchaction(struct wps_data *data, int* edge_offset, - struct touchregion **retregion); +int skin_get_touchaction(struct wps_data *data, int* edge_offset); void skin_disarm_touchregions(struct wps_data *data); #endif 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) * egde_offset is a percentage value for the position of the touch * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type. */ -int skin_get_touchaction(struct wps_data *data, int* edge_offset, - struct touchregion **retregion) +int skin_get_touchaction(struct wps_data *data, int* edge_offset) { int returncode = ACTION_NONE; short x,y; @@ -163,8 +162,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, /* On release, all regions are disarmed. */ if (released) skin_disarm_touchregions(data); - if (retregion && temp) - *retregion = temp; if (temp && temp->press_length == LONG_PRESS) temp->armed = false; -- cgit v1.2.3