diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2004-08-09 06:25:10 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2004-08-09 06:25:10 +0000 |
commit | a5bb9c38fdfe5dae353165f87c51e629a67a3d49 (patch) | |
tree | 7a3d389e5a06b1404516394a1a46ee83804fec33 | |
parent | 38c79fa1cdadf1fb545c51b1a0b69506ce76b0fa (diff) | |
download | netsurf-a5bb9c38fdfe5dae353165f87c51e629a67a3d49.tar.gz netsurf-a5bb9c38fdfe5dae353165f87c51e629a67a3d49.tar.bz2 |
[project @ 2004-08-09 06:25:10 by jmb]
Fix for background colour redraw when background images are turned off
svn path=/import/netsurf/; revision=1198
-rw-r--r-- | riscos/htmlredraw.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index d285629b1..e07754ba7 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -234,11 +234,11 @@ void html_redraw_box(struct box *box, 2 * scale); /* return if the box is completely outside the clip rectangle */ - if ((ro_gui_redraw_box_depth > 2) && + if ((ro_gui_redraw_box_depth > 2) && (clip_y1 < y0 || y1 < clip_y0 || clip_x1 < x0 || x1 < clip_x0)) return; - if ((ro_gui_redraw_box_depth > 2) && + if ((ro_gui_redraw_box_depth > 2) && (box->type == BOX_BLOCK || box->type == BOX_INLINE_BLOCK || box->type == BOX_TABLE_CELL || box->object)) { /* find intersection of clip rectangle and box */ @@ -271,15 +271,17 @@ void html_redraw_box(struct box *box, /* optimisation removed - transparent images break */ /* optimisation: skip if fully repeated bg image */ - if (!box->background/* || - box->style->background_repeat != + if (!box->background || + (ro_gui_current_redraw_gui && + !ro_gui_current_redraw_gui->option.background_images) + /* || box->style->background_repeat != CSS_BACKGROUND_REPEAT_REPEAT*/) { colourtrans_set_gcol( box->style->background_color << 8, colourtrans_USE_ECFS, os_ACTION_OVERWRITE, 0); - + os_plot(os_MOVE_TO, px0, py0); if (px0 < px1 && py0 < py1) |