Fix up RISC OS front end.

svn path=/trunk/netsurf/; revision=12545
This commit is contained in:
Michael Drake 2011-06-30 17:51:58 +00:00
parent 3bb83e0349
commit 9c4b9f5c94
5 changed files with 5 additions and 10 deletions

View File

@ -29,6 +29,7 @@ struct hlcache_handle;
struct history;
struct browser_window;
struct history_entry;
struct redraw_context;
struct history *history_create(void);
struct history *history_clone(struct history *history);

View File

@ -473,7 +473,6 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw,
int progress_ymid;
/* initialise the plotters */
plot = ro_plotters;
ro_plot_origin_x = 0;
ro_plot_origin_y = 0;
@ -502,14 +501,14 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw,
redraw->box.y0 + pb->visible.y0) >> 1;
if ((clip.x0 < clip.x1) && (clip.y0 < clip.y1)) {
if (progress_icon) {
plot.clip(&clip);
ro_plotters.clip(&clip);
_swix(Tinct_Plot, _IN(2) | _IN(3) | _IN(4) | _IN(7),
progress_icon,
redraw->box.x0 - pb->offset,
progress_ymid - progress_height,
tinct_FILL_HORIZONTALLY);
} else {
plot.rectangle(clip.x0, clip.y0,
ro_plotters.rectangle(clip.x0, clip.y0,
clip.x1, clip.y1,
plot_style_fill_red);
}

View File

@ -449,7 +449,6 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
assert(sb);
/* initialise the plotters */
plot = ro_plotters;
ro_plot_origin_x = 0;
ro_plot_origin_y = 0;
@ -487,7 +486,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw)
}
/* separate the widget from the text with a line */
plot.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1,
ro_plotters.rectangle((redraw->box.x0 + sb->width - WIDGET_WIDTH - 2) >> 1,
-redraw->box.y0 >> 1,
(redraw->box.x0 + sb->width - WIDGET_WIDTH) >> 1,
-redraw->box.y1 >> 1,

View File

@ -1011,8 +1011,6 @@ void ro_toolbar_redraw(wimp_draw *redraw)
assert(toolbar != NULL);
plot = ro_plotters;
error = xwimp_redraw_window(redraw, &more);
if (error) {
LOG(("xwimp_redraw_window: 0x%x: %s",

View File

@ -317,8 +317,6 @@ void ro_treeview_redraw_request(int x, int y, int width, int height,
wimp_draw update;
osbool more;
plot = ro_plotters;
update.w = tv->w;
update.box.x0 = (2 * x) + tv->origin.x;
update.box.y0 = (-2 * (y + height)) + tv->origin.y;
@ -404,7 +402,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more)
clip.y0 = (ro_plot_origin_y - redraw->clip.y1) / 2;
clip.x1 = (redraw->clip.x1 - ro_plot_origin_x) / 2;
clip.y1 = (ro_plot_origin_y - redraw->clip.y0) / 2;
plot.clip(&clip);
ro_plotters.clip(&clip);
}
error = xwimp_get_rectangle(redraw, &more);