From eda80390d5afc4346d2e64a256762df7df30bb17 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 15 Aug 2010 14:13:36 +0000 Subject: A bunch of new features for the bar type tags (%pb, %pv, %bl, etc): * the bar orientation (horiz/vert) is now chosen based on the width and heigt values (or can be forced). * the fill direction can now be inverted (fill right to left, or top to bottom is considered inverted) * It can now draw a slider type bar instead of a fill type (or indeed a slider with a fill type) To configure the new bar, any (or all) of the following params can be used after the bmp filename (order makes no difference either): invert - cause the bar to fill in the inverted direction vertical - draw a vertical bar (not needed if the height > width) horizontal - draw a horizontal bar (this is obviously the default) nofill - dont draw the filling bar (this still draws the outline, obviously pointless without the slider param) slider - draw an image for the slider. The next param MUST be the label of the image to draw. No option to use a subimage here, so the whole image needs to be the image you want on the slider. example: %pb(0,0,-,-,-,nofill, slider, slider_image, invert) - draw a boring horizontal progressbar which doesnt fill and only draws the image "slider_image" which moves right to left. the slider type might need some tweaking. let us know how it goes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27821 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'apps/gui/skin_engine/skin_parser.c') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 68cb01470c..341056ff87 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -540,6 +540,7 @@ static int parse_progressbar_tag(struct skin_element* element, struct skin_token_list *item; struct viewport *vp = &curr_vp->vp; struct skin_tag_parameter *param = element->params; + int curr_param = 0; if (element->params_count == 0 && element->tag->type != SKIN_TOKEN_PROGRESSBAR) @@ -554,6 +555,7 @@ static int parse_progressbar_tag(struct skin_element* element, pb->have_bitmap_pb = false; pb->bm.data = NULL; /* no bitmap specified */ pb->follow_lang_direction = follow_lang_direction > 0; + pb->invert_fill_direction = false; if (element->params_count == 0) { @@ -614,6 +616,41 @@ static int parse_progressbar_tag(struct skin_element* element, if (!isdefault(param)) pb->bm.data = param->data.text; + curr_param = 5; + pb->invert_fill_direction = false; + pb->nofill = false; + pb->slider = NULL; + pb->horizontal = pb->width > pb->height; + while (curr_param < element->params_count) + { + param++; + if (!strcmp(param->data.text, "invert")) + pb->invert_fill_direction = true; + else if (!strcmp(param->data.text, "nofill")) + pb->nofill = true; + else if (!strcmp(param->data.text, "slider")) + { + if (curr_param+1 < element->params_count) + { + curr_param++; + param++; + pb->slider = find_image(param->data.text, wps_data); + if (!pb->slider) + return -1; + } + } + else if (!strcmp(param->data.text, "vertical")) + { + pb->horizontal = false; + if (isdefault(&element->params[3])) + pb->height = vp->height - pb->x; + } + else if (!strcmp(param->data.text, "horizontal")) + pb->horizontal = true; + + curr_param++; + } + if (token->type == SKIN_TOKEN_VOLUME) token->type = SKIN_TOKEN_VOLUMEBAR; -- cgit v1.2.3