From 73b1e30bb04d87144c4106ff7a9457507d191491 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Tue, 4 Oct 2022 23:22:21 +0100 Subject: skin engine: Reduce scope of internal wps_data struct A bunch of public API calls take a wps_data struct argument, but that's an internal type that doesn't have a direct getter. Instead the skin engine provides a gui_wps struct as a way to refer to a particular skin instance. Use that instead of wps_data in the public API. Change-Id: I13e1aa8df7f08ccfb789bb728d493ac8d7de1a9b --- apps/gui/skin_engine/skin_engine.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'apps/gui/skin_engine/skin_engine.h') diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index b56674112c..d04c873e84 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h @@ -40,25 +40,18 @@ enum skinnable_screens { struct skin_stats; struct skin_viewport; -struct wps_data; +struct gui_wps; #ifdef HAVE_TOUCHSCREEN -int skin_get_touchaction(struct wps_data *data, int* edge_offset); -void skin_disarm_touchregions(struct wps_data *data); +int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset); +void skin_disarm_touchregions(struct gui_wps *gwps); #endif /* Do a update_type update of the skinned screen */ void skin_update(enum skinnable_screens skin, enum screen_type screen, unsigned int update_type); -/* - * setup up the skin-data from a format-buffer (isfile = false) - * or from a skinfile (isfile = true) - */ -bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, - const char *buf, bool isfile, struct skin_stats *stats); - -bool skin_has_sbs(enum screen_type screen, struct wps_data *data); +bool skin_has_sbs(struct gui_wps *gwps); /* load a backdrop into the skin buffer. -- cgit v1.2.3