diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index a81ae5ea1f..c4f8d1a8ca 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1124,11 +1124,6 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1124 | return WPS_ERROR_INVALID_PARAM; | 1124 | return WPS_ERROR_INVALID_PARAM; |
1125 | 1125 | ||
1126 | struct viewport *vp = &curr_vp->vp; | 1126 | struct viewport *vp = &curr_vp->vp; |
1127 | #ifndef __PCTOOL__ | ||
1128 | int font_height = font_get(vp->font)->height; | ||
1129 | #else | ||
1130 | int font_height = 8; | ||
1131 | #endif | ||
1132 | /* we need to know what line number (viewport relative) this pb is, | 1127 | /* we need to know what line number (viewport relative) this pb is, |
1133 | * so count them... */ | 1128 | * so count them... */ |
1134 | int line_num = -1; | 1129 | int line_num = -1; |
@@ -1187,7 +1182,18 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1187 | pb->height = height; | 1182 | pb->height = height; |
1188 | } | 1183 | } |
1189 | else | 1184 | else |
1190 | pb->height = font_height; | 1185 | { |
1186 | if (vp->font > FONT_UI) | ||
1187 | pb->height = -1; /* calculate at display time */ | ||
1188 | else | ||
1189 | { | ||
1190 | #ifndef __PCTOOL__ | ||
1191 | pb->height = font_get(vp->font)->height; | ||
1192 | #else | ||
1193 | pb->height = 8; | ||
1194 | #endif | ||
1195 | } | ||
1196 | } | ||
1191 | 1197 | ||
1192 | if (LIST_VALUE_PARSED(set, PB_Y)) /* y */ | 1198 | if (LIST_VALUE_PARSED(set, PB_Y)) /* y */ |
1193 | pb->y = y; | 1199 | pb->y = y; |