diff options
Diffstat (limited to 'apps/gui/skin_engine/wps_internals.h')
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 99b6e8ad9b..4136347a7b 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -191,7 +191,9 @@ struct wps_line { | |||
191 | #define VP_DRAW_HIDEABLE 0x1 | 191 | #define VP_DRAW_HIDEABLE 0x1 |
192 | #define VP_DRAW_HIDDEN 0x2 | 192 | #define VP_DRAW_HIDDEN 0x2 |
193 | #define VP_DRAW_WASHIDDEN 0x4 | 193 | #define VP_DRAW_WASHIDDEN 0x4 |
194 | struct wps_viewport { | 194 | #define VP_DEFAULT_LABEL '|' |
195 | #define VP_NO_LABEL '-' | ||
196 | struct skin_viewport { | ||
195 | struct viewport vp; /* The LCD viewport struct */ | 197 | struct viewport vp; /* The LCD viewport struct */ |
196 | struct progressbar *pb; | 198 | struct progressbar *pb; |
197 | /* Indexes of the first and last lines belonging to this viewport in the | 199 | /* Indexes of the first and last lines belonging to this viewport in the |
@@ -203,7 +205,7 @@ struct wps_viewport { | |||
203 | 205 | ||
204 | #ifdef HAVE_TOUCHSCREEN | 206 | #ifdef HAVE_TOUCHSCREEN |
205 | struct touchregion { | 207 | struct touchregion { |
206 | struct wps_viewport* wvp;/* The viewport this region is in */ | 208 | struct skin_viewport* wvp;/* The viewport this region is in */ |
207 | short int x; /* x-pos */ | 209 | short int x; /* x-pos */ |
208 | short int y; /* y-pos */ | 210 | short int y; /* y-pos */ |
209 | short int width; /* width */ | 211 | short int width; /* width */ |
@@ -262,8 +264,7 @@ struct wps_data | |||
262 | int num_lines; | 264 | int num_lines; |
263 | 265 | ||
264 | /* Number of viewports in the WPS */ | 266 | /* Number of viewports in the WPS */ |
265 | int num_viewports; | 267 | struct skin_token_list *viewports; |
266 | struct wps_viewport viewports[WPS_MAX_VIEWPORTS]; | ||
267 | 268 | ||
268 | struct wps_line lines[WPS_MAX_LINES]; | 269 | struct wps_line lines[WPS_MAX_LINES]; |
269 | 270 | ||
@@ -346,5 +347,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
346 | 347 | ||
347 | 348 | ||
348 | struct gui_img* find_image(int n, struct wps_data *data); | 349 | struct gui_img* find_image(int n, struct wps_data *data); |
350 | struct skin_viewport* find_viewport(char label, struct wps_data *data); | ||
349 | 351 | ||
350 | #endif | 352 | #endif |