diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 13 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.h | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 5 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 | ||||
-rw-r--r-- | apps/screen_access.c | 1 | ||||
-rw-r--r-- | apps/screen_access.h | 4 |
7 files changed, 20 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 4f491dea24..24958a46f2 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -302,17 +302,20 @@ void clear_image_pos(struct gui_wps *gwps, struct gui_img *img) | |||
302 | gwps->display->set_drawmode(DRMODE_SOLID); | 302 | gwps->display->set_drawmode(DRMODE_SOLID); |
303 | } | 303 | } |
304 | 304 | ||
305 | void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, int subimage) | 305 | void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, |
306 | int subimage, struct viewport* vp) | ||
306 | { | 307 | { |
307 | struct screen *display = gwps->display; | 308 | struct screen *display = gwps->display; |
308 | img->bm.data = core_get_data(img->buflib_handle); | 309 | img->bm.data = core_get_data(img->buflib_handle); |
309 | display->set_drawmode(DRMODE_SOLID); | 310 | display->set_drawmode(DRMODE_SOLID); |
310 | 311 | ||
311 | display->bmp_part(&img->bm, 0, img->subimage_height * subimage, | 312 | if (img->is_9_segment) |
312 | img->x, img->y, img->bm.width, img->subimage_height); | 313 | display->nine_segment_bmp(&img->bm, 0, 0, vp->width, vp->height); |
314 | else | ||
315 | display->bmp_part(&img->bm, 0, img->subimage_height * subimage, | ||
316 | img->x, img->y, img->bm.width, img->subimage_height); | ||
313 | } | 317 | } |
314 | 318 | ||
315 | |||
316 | void wps_display_images(struct gui_wps *gwps, struct viewport* vp) | 319 | void wps_display_images(struct gui_wps *gwps, struct viewport* vp) |
317 | { | 320 | { |
318 | if(!gwps || !gwps->data || !gwps->display) | 321 | if(!gwps || !gwps->data || !gwps->display) |
@@ -334,7 +337,7 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp) | |||
334 | { | 337 | { |
335 | if (img->display >= 0) | 338 | if (img->display >= 0) |
336 | { | 339 | { |
337 | wps_draw_image(gwps, img, img->display); | 340 | wps_draw_image(gwps, img, img->display, vp); |
338 | } | 341 | } |
339 | } | 342 | } |
340 | list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next); | 343 | list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next); |
diff --git a/apps/gui/skin_engine/skin_display.h b/apps/gui/skin_engine/skin_display.h index 81d04e5a60..b3422b0360 100644 --- a/apps/gui/skin_engine/skin_display.h +++ b/apps/gui/skin_engine/skin_display.h | |||
@@ -34,7 +34,6 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb); | |||
34 | void draw_playlist_viewer_list(struct gui_wps *gwps, struct playlistviewer *viewer); | 34 | void draw_playlist_viewer_list(struct gui_wps *gwps, struct playlistviewer *viewer); |
35 | /* clears the area where the image was shown */ | 35 | /* clears the area where the image was shown */ |
36 | void clear_image_pos(struct gui_wps *gwps, struct gui_img *img); | 36 | void clear_image_pos(struct gui_wps *gwps, struct gui_img *img); |
37 | void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, int subimage); | ||
38 | void wps_display_images(struct gui_wps *gwps, struct viewport* vp); | 37 | void wps_display_images(struct gui_wps *gwps, struct viewport* vp); |
39 | 38 | ||
40 | 39 | ||
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 93f310df56..94adaf3116 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -344,6 +344,9 @@ static int parse_image_display(struct skin_element *element, | |||
344 | token->type = SKIN_TOKEN_IMAGE_DISPLAY_LISTICON; | 344 | token->type = SKIN_TOKEN_IMAGE_DISPLAY_LISTICON; |
345 | } | 345 | } |
346 | 346 | ||
347 | if (token->type == SKIN_TOKEN_IMAGE_DISPLAY_9SEGMENT) | ||
348 | img->is_9_segment = true; | ||
349 | |||
347 | if (element->params_count > 1) | 350 | if (element->params_count > 1) |
348 | { | 351 | { |
349 | if (get_param(element, 1)->type == CODE) | 352 | if (get_param(element, 1)->type == CODE) |
@@ -417,6 +420,7 @@ static int parse_image_load(struct skin_element *element, | |||
417 | img->display = -1; | 420 | img->display = -1; |
418 | img->using_preloaded_icons = false; | 421 | img->using_preloaded_icons = false; |
419 | img->buflib_handle = -1; | 422 | img->buflib_handle = -1; |
423 | img->is_9_segment = false; | ||
420 | 424 | ||
421 | /* save current viewport */ | 425 | /* save current viewport */ |
422 | img->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); | 426 | img->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); |
@@ -2181,6 +2185,7 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2181 | token->value.data = get_param(element, 0)->data.text; | 2185 | token->value.data = get_param(element, 0)->data.text; |
2182 | break; | 2186 | break; |
2183 | case SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY: | 2187 | case SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY: |
2188 | case SKIN_TOKEN_IMAGE_DISPLAY_9SEGMENT: | ||
2184 | function = parse_image_display; | 2189 | function = parse_image_display; |
2185 | break; | 2190 | break; |
2186 | case SKIN_TOKEN_IMAGE_PRELOAD: | 2191 | case SKIN_TOKEN_IMAGE_PRELOAD: |
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index 0fdf6b019f..e01972fc3b 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -231,6 +231,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
231 | break; | 231 | break; |
232 | case SKIN_TOKEN_IMAGE_DISPLAY_LISTICON: | 232 | case SKIN_TOKEN_IMAGE_DISPLAY_LISTICON: |
233 | case SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY: | 233 | case SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY: |
234 | case SKIN_TOKEN_IMAGE_DISPLAY_9SEGMENT: | ||
234 | { | 235 | { |
235 | struct image_display *id = SKINOFFSETTOPTR(skin_buffer, token->value.data); | 236 | struct image_display *id = SKINOFFSETTOPTR(skin_buffer, token->value.data); |
236 | const char* label = SKINOFFSETTOPTR(skin_buffer, id->label); | 237 | const char* label = SKINOFFSETTOPTR(skin_buffer, id->label); |
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 8cd5d9cb60..72bab9b668 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -82,6 +82,7 @@ struct gui_img { | |||
82 | bool loaded; /* load state */ | 82 | bool loaded; /* load state */ |
83 | int display; | 83 | int display; |
84 | bool using_preloaded_icons; /* using the icon system instead of a bmp */ | 84 | bool using_preloaded_icons; /* using the icon system instead of a bmp */ |
85 | bool is_9_segment; | ||
85 | }; | 86 | }; |
86 | 87 | ||
87 | struct image_display { | 88 | struct image_display { |
diff --git a/apps/screen_access.c b/apps/screen_access.c index fc92210981..79ab459475 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -195,6 +195,7 @@ struct screen screens[NB_SCREENS] = | |||
195 | #endif | 195 | #endif |
196 | .bmp = &lcd_bmp, | 196 | .bmp = &lcd_bmp, |
197 | .bmp_part = &lcd_bmp_part, | 197 | .bmp_part = &lcd_bmp_part, |
198 | .nine_segment_bmp = &lcd_nine_segment_bmp, | ||
198 | #if LCD_DEPTH > 1 | 199 | #if LCD_DEPTH > 1 |
199 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 | 200 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 |
200 | .color_to_native=&lcd_color_to_native, | 201 | .color_to_native=&lcd_color_to_native, |
diff --git a/apps/screen_access.h b/apps/screen_access.h index ab2ef4f14d..ea05a2294d 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -167,6 +167,10 @@ struct screen | |||
167 | unsigned start, unsigned end); | 167 | unsigned start, unsigned end); |
168 | #endif | 168 | #endif |
169 | #endif | 169 | #endif |
170 | #if defined(HAVE_LCD_BITMAP) | ||
171 | void (*nine_segment_bmp)(const struct bitmap* bm, int x, int y, | ||
172 | int width, int height); | ||
173 | #endif | ||
170 | }; | 174 | }; |
171 | 175 | ||
172 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) | 176 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) |