devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#9904 - Fix for FS#9894 - Position of the progress bar is not updated after the font is changed (with small changes by me)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20015 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-02-16 08:28:51 +00:00
parent a2f92c9e17
commit 54c2f49a69
3 changed files with 40 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
apps/gui/gwps-common.c
View file

@ -476,19 +476,29 @@ void display_keylock_text(bool locked)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
static void draw_progressbar(struct gui_wps *gwps, static void draw_progressbar(struct gui_wps *gwps,
struct progressbar *pb) struct wps_viewport *wps_vp)
{ {
struct screen *display = gwps->display; struct screen *display = gwps->display;
struct wps_state *state = gwps->state; struct wps_state *state = gwps->state;
struct progressbar *pb = wps_vp->pb;
int y = pb->y;
int line_height = font_get(wps_vp->vp.font)->height;
/* center the pb in the line, but only if the line is higher than the pb */
int center = (line_height-pb->height)/2;
if (y < 0) /* if Y was not set calculate by font height,Y is -line_number-1 */
y = (-y -1)*line_height + (0 > center ? 0 : center);
if (pb->have_bitmap_pb) if (pb->have_bitmap_pb)
gui_bitmap_scrollbar_draw(display, pb->bm, gui_bitmap_scrollbar_draw(display, pb->bm,
pb->x, pb->y, pb->width, pb->bm.height, pb->x, y, pb->width, pb->bm.height,
state->id3->length ? state->id3->length : 1, 0, state->id3->length ? state->id3->length : 1, 0,
state->id3->length ? state->id3->elapsed state->id3->length ? state->id3->elapsed
+ state->ff_rewind_count : 0, + state->ff_rewind_count : 0,
HORIZONTAL); HORIZONTAL);
else else
gui_scrollbar_draw(display, pb->x, pb->y, pb->width, pb->height, gui_scrollbar_draw(display, pb->x, y, pb->width, pb->height,
state->id3->length ? state->id3->length : 1, 0, state->id3->length ? state->id3->length : 1, 0,
state->id3->length ? state->id3->elapsed state->id3->length ? state->id3->elapsed
+ state->ff_rewind_count : 0, + state->ff_rewind_count : 0,
@ -496,12 +506,12 @@ static void draw_progressbar(struct gui_wps *gwps,
#ifdef AB_REPEAT_ENABLE #ifdef AB_REPEAT_ENABLE
if ( ab_repeat_mode_enabled() && state->id3->length != 0 ) if ( ab_repeat_mode_enabled() && state->id3->length != 0 )
ab_draw_markers(display, state->id3->length, ab_draw_markers(display, state->id3->length,
pb->x, pb->x + pb->width, pb->y, pb->height); pb->x, pb->x + pb->width, y, pb->height);
#endif #endif
if ( cuesheet_is_enabled() && state->id3->cuesheet_type ) if ( cuesheet_is_enabled() && state->id3->cuesheet_type )
cue_draw_markers(display, state->id3->length, cue_draw_markers(display, state->id3->length,
pb->x, pb->x + pb->width, pb->y+1, pb->height-2); pb->x, pb->x + pb->width, y+1, pb->height-2);
} }
/* clears the area where the image was shown */ /* clears the area where the image was shown */
@ -2008,7 +2018,8 @@ bool gui_wps_refresh(struct gui_wps *gwps,
} }
for (v = 0; v < data->num_viewports; v++) for (v = 0; v < data->num_viewports; v++)
{ {
display->set_viewport(&data->viewports[v].vp); struct wps_viewport *wps_vp = &(data->viewports[v]);
display->set_viewport(&wps_vp->vp);
vp_refresh_mode = refresh_mode; vp_refresh_mode = refresh_mode;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
@ -2019,27 +2030,27 @@ bool gui_wps_refresh(struct gui_wps *gwps,
} }
#endif #endif
/* dont redraw the viewport if its disabled */ /* dont redraw the viewport if its disabled */
if ((data->viewports[v].hidden_flags&VP_DRAW_HIDDEN)) if ((wps_vp->hidden_flags&VP_DRAW_HIDDEN))
{ {
if (!(data->viewports[v].hidden_flags&VP_DRAW_WASHIDDEN)) if (!(wps_vp->hidden_flags&VP_DRAW_WASHIDDEN))
display->scroll_stop(&data->viewports[v].vp); display->scroll_stop(&wps_vp->vp);
data->viewports[v].hidden_flags |= VP_DRAW_WASHIDDEN; wps_vp->hidden_flags |= VP_DRAW_WASHIDDEN;
continue; continue;
} }
else if (((data->viewports[v].hidden_flags& else if (((wps_vp->hidden_flags&
(VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)) (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))
== (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))) == (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)))
{ {
vp_refresh_mode = WPS_REFRESH_ALL; vp_refresh_mode = WPS_REFRESH_ALL;
data->viewports[v].hidden_flags = VP_DRAW_HIDEABLE; wps_vp->hidden_flags = VP_DRAW_HIDEABLE;
} }
if (vp_refresh_mode == WPS_REFRESH_ALL) if (vp_refresh_mode == WPS_REFRESH_ALL)
{ {
display->clear_viewport(); display->clear_viewport();
} }
for (line = data->viewports[v].first_line; for (line = wps_vp->first_line;
line <= data->viewports[v].last_line; line++) line <= wps_vp->last_line; line++)
{ {
memset(linebuf, 0, sizeof(linebuf)); memset(linebuf, 0, sizeof(linebuf));
update_line = false; update_line = false;
@ -2065,8 +2076,8 @@ bool gui_wps_refresh(struct gui_wps *gwps,
/* the peakmeter should be alone on its line */ /* the peakmeter should be alone on its line */
update_line = false; update_line = false;
int h = font_get(data->viewports[v].vp.font)->height; int h = font_get(wps_vp->vp.font)->height;
int peak_meter_y = (line - data->viewports[v].first_line)* h; int peak_meter_y = (line - wps_vp->first_line)* h;
/* The user might decide to have the peak meter in the last /* The user might decide to have the peak meter in the last
line so that it is only displayed if no status bar is line so that it is only displayed if no status bar is
@ -2110,10 +2121,10 @@ bool gui_wps_refresh(struct gui_wps *gwps,
/* if the line is a scrolling one we don't want to update /* if the line is a scrolling one we don't want to update
too often, so that it has the time to scroll */ too often, so that it has the time to scroll */
if ((vp_refresh_mode & WPS_REFRESH_SCROLL) || new_subline_refresh) if ((vp_refresh_mode & WPS_REFRESH_SCROLL) || new_subline_refresh)
write_line(display, &align, line - data->viewports[v].first_line, true); write_line(display, &align, line - wps_vp->first_line, true);
} }
else else
write_line(display, &align, line - data->viewports[v].first_line, false); write_line(display, &align, line - wps_vp->first_line, false);
} }
} }
@ -2121,11 +2132,13 @@ bool gui_wps_refresh(struct gui_wps *gwps,
/* progressbar */ /* progressbar */
if (vp_refresh_mode & WPS_REFRESH_PLAYER_PROGRESS) if (vp_refresh_mode & WPS_REFRESH_PLAYER_PROGRESS)
{ {
if (data->viewports[v].pb) if (wps_vp->pb)
draw_progressbar(gwps, data->viewports[v].pb); {
draw_progressbar(gwps, wps_vp);
}
} }
/* Now display any images in this viewport */ /* Now display any images in this viewport */
wps_display_images(gwps, &data->viewports[v].vp); wps_display_images(gwps, &wps_vp->vp);
#endif #endif
} }

1
apps/gui/gwps.h
View file

@ -73,6 +73,7 @@ struct gui_img{
struct progressbar { struct progressbar {
/* regular pb */ /* regular pb */
short x; short x;
/* Negative if y is line number based (-line_num-1), positive if set explicitely */
short y; short y;
short width; short width;
short height; short height;

8
apps/gui/wps_parser.c
View file

@ -875,8 +875,8 @@ static int parse_progressbar(const char *wps_bufptr,
#else #else
int font_height = 8; int font_height = 8;
#endif #endif
int line_y_pos = font_height*(wps_data->num_lines - int line_num = wps_data->num_lines -
wps_data->viewports[wps_data->num_viewports].first_line); wps_data->viewports[wps_data->num_viewports].first_line;
if (wps_data->progressbar_count >= MAX_PROGRESSBARS) if (wps_data->progressbar_count >= MAX_PROGRESSBARS)
return WPS_ERROR_INVALID_PARAM; return WPS_ERROR_INVALID_PARAM;
@ -889,7 +889,7 @@ static int parse_progressbar(const char *wps_bufptr,
pb->x = 0; pb->x = 0;
pb->width = vp->width; pb->width = vp->width;
pb->height = SYSFONT_HEIGHT-2; pb->height = SYSFONT_HEIGHT-2;
pb->y = line_y_pos + (font_height-pb->height)/2; pb->y = -line_num - 1; /* Will be computed during the rendering */
wps_data->viewports[wps_data->num_viewports].pb = pb; wps_data->viewports[wps_data->num_viewports].pb = pb;
wps_data->progressbar_count++; wps_data->progressbar_count++;
@ -934,7 +934,7 @@ static int parse_progressbar(const char *wps_bufptr,
if (LIST_VALUE_PARSED(set, PB_Y)) /* y */ if (LIST_VALUE_PARSED(set, PB_Y)) /* y */
pb->y = y; pb->y = y;
else else
pb->y = line_y_pos + (font_height-pb->height)/2; pb->y = -line_num - 1; /* Will be computed during the rendering */
wps_data->viewports[wps_data->num_viewports].pb = pb; wps_data->viewports[wps_data->num_viewports].pb = pb;
wps_data->progressbar_count++; wps_data->progressbar_count++;