diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-07-15 06:24:11 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-07-15 06:24:11 +0000 |
commit | 15488a00eae8d10249015b88e4b7bdc47365b854 (patch) | |
tree | 62439c56fa8a926b148c7a3cc843a0c60f3aac21 /lib/skin_parser/skin_parser.h | |
parent | 387af97a26105fce79e6a8726752cf183d40939e (diff) | |
download | rockbox-15488a00eae8d10249015b88e4b7bdc47365b854.tar.gz rockbox-15488a00eae8d10249015b88e4b7bdc47365b854.zip |
Theme Editor: Committed FS#11477 to add a DECIMAL parameter type in the parser and adapt the Theme Editor to accomodate the change by Johnathan Gordon. Fixed bug in the parser caused by the patch (error was thrown on zero value) and adapted tag rendering for new format
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27426 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'lib/skin_parser/skin_parser.h')
-rw-r--r-- | lib/skin_parser/skin_parser.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h index 126a014b5a..ad10f90125 100644 --- a/lib/skin_parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h | |||
@@ -56,6 +56,7 @@ enum skin_errorcode | |||
56 | UNEXPECTED_NEWLINE, | 56 | UNEXPECTED_NEWLINE, |
57 | INSUFFICIENT_ARGS, | 57 | INSUFFICIENT_ARGS, |
58 | INT_EXPECTED, | 58 | INT_EXPECTED, |
59 | DECIMAL_EXPECTED, | ||
59 | SEPERATOR_EXPECTED, | 60 | SEPERATOR_EXPECTED, |
60 | CLOSE_EXPECTED, | 61 | CLOSE_EXPECTED, |
61 | MULTILINE_EXPECTED | 62 | MULTILINE_EXPECTED |
@@ -66,7 +67,8 @@ struct skin_tag_parameter | |||
66 | { | 67 | { |
67 | enum | 68 | enum |
68 | { | 69 | { |
69 | NUMERIC, | 70 | INTEGER, |
71 | DECIMAL, /* stored in data.number as (whole*10)+part */ | ||
70 | STRING, | 72 | STRING, |
71 | CODE, | 73 | CODE, |
72 | DEFAULT | 74 | DEFAULT |
@@ -74,7 +76,7 @@ struct skin_tag_parameter | |||
74 | 76 | ||
75 | union | 77 | union |
76 | { | 78 | { |
77 | int numeric; | 79 | int number; |
78 | char* text; | 80 | char* text; |
79 | struct skin_element* code; | 81 | struct skin_element* code; |
80 | } data; | 82 | } data; |