From 9b6ac01c7b55691b62aab15c3302a46f61972197 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 6 Sep 2011 13:49:41 +0000 Subject: Lists can now be completly draw using the skin engine! due to lack of user feedback the actual tags may change, hopefully not though. The way it works is the skin specifies a rectangle and a viewport label. For each item in the list that is being displayed all viewports with the specified label are drawn. However, instead of the viewport x/y position being offset from the top left corner like normal they are offset from the rectangle position in the list (so think of them as child-viewports of the rectangle which moves). Normally the rectangle will move down the screen to show a normal list, this can be changed to move across the screen in a grid pattern. The UI viewport is used to bound the items (i.e %Vi() ) Scrolling is completly disabled in all items except the currently selected item. This works well in combination with the %cs tag to show differently styled lists based on the current screen :) New tags: %LT - Get the current items text %LI - Get the current items icon number %Lc - Use as a conditional to determine if the current item is the selected item %LB - BAR TAG to show the scroll bar, params/options like other bar types. It still needs a bit of work though. Use as a conditional to find out if the bar is actually needed %Lb(viewport, width, height [,tile]) - specify the viewport label to draw for each item and the size of each item. if the last param is 'tile' it will form a grid instead of a list example.sbs: %?cs<%Lb(a,100,20)|> %V(0,0,10,-,1)%Vf(aabbcc) %?LB<%LB(0,0,10,185, invert)> %Vi(-,10,0,-,-35,1) %Vl(a,5,5,160,12,1) %s%?Lc<%Vg(00ffaa, ff0000, 000000)%Vs(gradient)%>%>%>%ac>zzzzzzz %LT zzzzz%s%?Lc<%ar%<%<%<> %V(0,185,-,-,1) %s%LT git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30461 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_render.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'apps/gui/skin_engine/skin_render.c') diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index 27e6747c29..dd266b1ee6 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c @@ -46,6 +46,7 @@ #include "playlist.h" #include "root_menu.h" #include "misc.h" +#include "list.h" #define MAX_LINE 1024 @@ -142,6 +143,11 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, } } break; + case SKIN_TOKEN_LIST_ITEM_CFG: + if (do_refresh) + skinlist_set_cfg(gwps->display->screen_type, + token->value.data); + break; #ifdef HAVE_LCD_BITMAP case SKIN_TOKEN_UIVIEWPORT_ENABLE: sb_set_info_vp(gwps->display->screen_type, @@ -164,6 +170,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, #ifdef HAVE_LCD_BITMAP case SKIN_TOKEN_PROGRESSBAR: case SKIN_TOKEN_TUNER_RSSI_BAR: + case SKIN_TOKEN_LIST_SCROLLBAR: { struct progressbar *bar = (struct progressbar*)token->value.data; if (do_refresh) @@ -488,10 +495,10 @@ static bool skin_render_line(struct skin_element* line, struct skin_draw_info *i if (!do_non_text_tags(info->gwps, info, child, &info->skin_vp->vp)) { static char tempbuf[128]; - const char *value = get_token_value(info->gwps, child->data, + const char *valuestr = get_token_value(info->gwps, child->data, info->offset, tempbuf, sizeof(tempbuf), NULL); - if (value) + if (valuestr) { #if CONFIG_RTC if (child->tag->flags&SKIN_RTC_REFRESH) @@ -499,7 +506,7 @@ static bool skin_render_line(struct skin_element* line, struct skin_draw_info *i #endif needs_update = needs_update || ((child->tag->flags&info->refresh_type)!=0); - strlcat(info->cur_align_start, value, + strlcat(info->cur_align_start, valuestr, info->buf_size - (info->cur_align_start-info->buf)); } } @@ -612,8 +619,8 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info return changed_lines || ret; } -static void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, - struct skin_viewport* skin_viewport, unsigned long refresh_type) +void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, + struct skin_viewport* skin_viewport, unsigned long refresh_type) { struct screen *display = gwps->display; char linebuf[MAX_LINE]; @@ -784,10 +791,11 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) } #ifdef HAVE_LCD_BITMAP -static __attribute__((noinline)) void skin_render_playlistviewer(struct playlistviewer* viewer, - struct gui_wps *gwps, - struct skin_viewport* skin_viewport, - unsigned long refresh_type) +static __attribute__((noinline)) +void skin_render_playlistviewer(struct playlistviewer* viewer, + struct gui_wps *gwps, + struct skin_viewport* skin_viewport, + unsigned long refresh_type) { struct screen *display = gwps->display; char linebuf[MAX_LINE]; -- cgit v1.2.3