From dd137301121b4e45d3b2e28ba756c22f3212cbfa Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 5 Feb 2009 00:14:52 +0000 Subject: [PATCH] Minor quickscreen and pitchscreen fixes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19924 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/pitchscreen.c | 5 ++--- apps/gui/quickscreen.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c index 746af0d7de..db50a5d866 100644 --- a/apps/gui/pitchscreen.c +++ b/apps/gui/pitchscreen.c @@ -68,7 +68,6 @@ static void pitchscreen_fix_viewports(struct viewport *parent, pitch_viewports[i] = *parent; pitch_viewports[i].height = height; } - pitch_viewports[PITCH_TOP].y += ICON_BORDER; pitch_viewports[PITCH_MID].x += ICON_BORDER; @@ -98,6 +97,7 @@ static void pitchscreen_draw_icons (struct screen *display, display->mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], 2, parent->height /2 - 4, 7, 8); + display->update_viewport(); } static void pitchscreen_draw (struct screen *display, int max_lines, @@ -153,7 +153,7 @@ static void pitchscreen_draw (struct screen *display, int max_lines, snprintf((char *)buf, sizeof(buf), "%d.%d%%", pitch / 10, pitch % 10 ); display->getstringsize(buf,&width_val,&h); - display->putsxy((pitch_viewports[PITCH_MID].width / 2) - (w / 2), + display->putsxy((pitch_viewports[PITCH_MID].width / 2) - (width_val / 2), (show_lang_pitch? h : h/2), buf); /* What's wider? LANG_PITCH or the value? @@ -272,7 +272,6 @@ int gui_syncpitchscreen_run(void) /* also, draw the icons now, it's only needed once */ pitchscreen_draw_icons(&screens[i], &parent[i]); - screens[i].update(); } #if CONFIG_CODEC == SWCODEC pcmbuf_set_low_latency(true); diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index c554195d27..b39105dc72 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c @@ -70,7 +70,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs, /* center the icons VP first */ vp_icons[screen] = *parent; vp_icons[screen].width = CENTER_ICONAREA_WIDTH; /* abosulte smallest allowed */ - vp_icons[screen].x = (parent->width-parent->x-CENTER_ICONAREA_WIDTH)/2; + vp_icons[screen].x = parent->x + (parent->width / 2 - CENTER_ICONAREA_WIDTH / 2); vps[screen][QUICKSCREEN_BOTTOM] = *parent; if (nb_lines <= MIN_LINES) /* make the bottom item use 1 line */