summaryrefslogtreecommitdiff
path: root/riscos/gui
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2006-10-11 23:23:40 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2006-10-11 23:23:40 +0000
commitab03c6736098f4123ff6865ec6a12fe8ba4b3feb (patch)
treec172afb1004d30ace490da248be87ca576b6419c /riscos/gui
parent2227b7c582078cfcdc77fc665baca69fa5d8ced8 (diff)
downloadnetsurf-ab03c6736098f4123ff6865ec6a12fe8ba4b3feb.tar.gz
netsurf-ab03c6736098f4123ff6865ec6a12fe8ba4b3feb.tar.bz2
Fix redraw when no sprites are present. Squash compiler warnings.
svn path=/trunk/netsurf/; revision=2994
Diffstat (limited to 'riscos/gui')
-rw-r--r--riscos/gui/progress_bar.c16
-rw-r--r--riscos/gui/progress_bar.h1
2 files changed, 9 insertions, 8 deletions
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