From ab03c6736098f4123ff6865ec6a12fe8ba4b3feb Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Wed, 11 Oct 2006 23:23:40 +0000 Subject: Fix redraw when no sprites are present. Squash compiler warnings. svn path=/trunk/netsurf/; revision=2994 --- riscos/gui/progress_bar.c | 16 +++++++++------- riscos/gui/progress_bar.h | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'riscos/gui') diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index a343771a5..042e812ab 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -44,6 +44,8 @@ struct progress_bar { int cur_height; /**< current calculated height */ }; +static char progress_animation_sprite[] = "progress\0"; + struct wimp_window_base progress_bar_definition = { {0, 0, 1, 1}, 0, @@ -94,11 +96,11 @@ void ro_gui_progress_bar_init(osspriteop_area *icons) { progress_icon = NULL; error = xosspriteop_select_sprite(osspriteop_USER_AREA, progress_bar_definition.sprite_area, - (osspriteop_id)"progress", &progress_icon); + (osspriteop_id)progress_animation_sprite, &progress_icon); if (!error) { xosspriteop_read_sprite_info(osspriteop_USER_AREA, progress_bar_definition.sprite_area, - (osspriteop_id)"progress", + (osspriteop_id)progress_animation_sprite, &progress_width, &progress_height, 0, 0); } } @@ -461,11 +463,11 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, struct progress_bar *p tinct_FILL_HORIZONTALLY); } } else { - plot.fill(redraw->box.x0 + pb->visible.x0, - redraw->box.y0 + pb->visible.y0, - redraw->box.x0 + pb->visible.x1, - redraw->box.y0 + pb->visible.y1, - 0xff000000); + plot.fill((redraw->box.x0 + pb->visible.x0) >> 1, + -(redraw->box.y0 + pb->visible.y0) >> 1, + (redraw->box.x0 + pb->visible.x1) >> 1, + -(redraw->box.y0 + pb->visible.y1) >> 1, + 0x000000ff); } error = xwimp_get_rectangle(redraw, &more); if (error) { diff --git a/riscos/gui/progress_bar.h b/riscos/gui/progress_bar.h index 063326b82..c1622c0dd 100644 --- a/riscos/gui/progress_bar.h +++ b/riscos/gui/progress_bar.h @@ -29,5 +29,4 @@ void ro_gui_progress_bar_set_value(struct progress_bar *pb, unsigned int value); unsigned int ro_gui_progress_bar_get_value(struct progress_bar *pb); void ro_gui_progress_bar_set_range(struct progress_bar *pb, unsigned int range); unsigned int ro_gui_progress_bar_get_range(struct progress_bar *pb); -void ro_gui_progress_bar_set_visible(struct progress_bar *pb, bool visible); #endif -- cgit v1.2.3