summaryrefslogtreecommitdiffstats
path: root/apps/gui/skin_engine/skin_parser.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-09-06 13:49:41 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-09-06 13:49:41 +0000
commit9b6ac01c7b55691b62aab15c3302a46f61972197 (patch)
tree8868026c013cddc6c6722597724006eef911c554 /apps/gui/skin_engine/skin_parser.c
parent77a82ad56ab8aa923f47c908ac10b167c8051cf3 (diff)
downloadrockbox-9b6ac01c7b55691b62aab15c3302a46f61972197.tar.gz
rockbox-9b6ac01c7b55691b62aab15c3302a46f61972197.zip
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
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r--apps/gui/skin_engine/skin_parser.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 58ac5f552c..049c117af3 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -483,6 +483,32 @@ static int parse_viewport_gradient_setup(struct skin_element *element,
}
#endif
+
+static int parse_listitemviewport(struct skin_element *element,
+ struct wps_token *token,
+ struct wps_data *wps_data)
+{
+ struct listitem_viewport_cfg *cfg =
+ (struct listitem_viewport_cfg *)skin_buffer_alloc(
+ sizeof(struct listitem_viewport_cfg));
+ if (!cfg)
+ return -1;
+ cfg->data = wps_data;
+ cfg->tile = false;
+ cfg->label = element->params[0].data.text;
+ cfg->width = -1;
+ cfg->height = -1;
+ if (!isdefault(&element->params[1]))
+ cfg->width = element->params[1].data.number;
+ if (!isdefault(&element->params[2]))
+ cfg->height = element->params[2].data.number;
+ if (element->params_count > 3 &&
+ !strcmp(element->params[3].data.text, "tile"))
+ cfg->tile = true;
+ token->value.data = (void*)cfg;
+ return 0;
+}
+
#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
static int parse_viewporttextstyle(struct skin_element *element,
struct wps_token *token,
@@ -877,6 +903,8 @@ static int parse_progressbar_tag(struct skin_element* element,
token->type = SKIN_TOKEN_PEAKMETER_LEFTBAR;
else if (token->type == SKIN_TOKEN_PEAKMETER_RIGHT)
token->type = SKIN_TOKEN_PEAKMETER_RIGHTBAR;
+ else if (token->type == SKIN_TOKEN_LIST_NEEDS_SCROLLBAR)
+ token->type = SKIN_TOKEN_LIST_SCROLLBAR;
pb->type = token->type;
return 0;
@@ -1719,6 +1747,7 @@ static int skin_element_callback(struct skin_element* element, void* data)
case SKIN_TOKEN_PLAYER_PROGRESSBAR:
case SKIN_TOKEN_PEAKMETER_LEFT:
case SKIN_TOKEN_PEAKMETER_RIGHT:
+ case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR:
#ifdef HAVE_RADIO_RSSI
case SKIN_TOKEN_TUNER_RSSI:
#endif
@@ -1809,6 +1838,9 @@ static int skin_element_callback(struct skin_element* element, void* data)
function = parse_skinvar;
break;
#endif
+ case SKIN_TOKEN_LIST_ITEM_CFG:
+ function = parse_listitemviewport;
+ break;
default:
break;
}