summaryrefslogtreecommitdiff
path: root/render/html_redraw.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-05-09 22:49:17 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-05-09 22:49:17 +0000
commitac447fc293d791bf3155903d7755768f7a2b48ee (patch)
tree8d09d0e6228e9fbc1a834769e4553e816c643bb4 /render/html_redraw.c
parent5c95b32756affc5ce3ef88f919da4e3f801d776e (diff)
downloadnetsurf-ac447fc293d791bf3155903d7755768f7a2b48ee.tar.gz
netsurf-ac447fc293d791bf3155903d7755768f7a2b48ee.tar.bz2
s/scroll/scrollbar/ and improve scrollbar widget comments.
svn path=/trunk/netsurf/; revision=12363
Diffstat (limited to 'render/html_redraw.c')
-rw-r--r--render/html_redraw.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 2d1a78559..df8fd8d41 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -42,7 +42,7 @@
#include "desktop/options.h"
#include "desktop/print.h"
#include "desktop/search.h"
-#include "desktop/scroll.h"
+#include "desktop/scrollbar.h"
#include "image/bitmap.h"
#include "render/box.h"
#include "render/font.h"
@@ -650,8 +650,8 @@ bool html_redraw_box(struct box *box, int x_parent, int y_parent,
return false;
if (box->object && width != 0 && height != 0) {
- x_scrolled = x - scroll_get_offset(box->scroll_x) * scale;
- y_scrolled = y - scroll_get_offset(box->scroll_y) * scale;
+ x_scrolled = x - scrollbar_get_offset(box->scroll_x) * scale;
+ y_scrolled = y - scrollbar_get_offset(box->scroll_y) * scale;
if (!content_redraw(box->object,
x_scrolled + padding_left,
y_scrolled + padding_top,
@@ -693,9 +693,9 @@ bool html_redraw_box(struct box *box, int x_parent, int y_parent,
if (box->list_marker)
if (!html_redraw_box(box->list_marker,
x_parent + box->x -
- scroll_get_offset(box->scroll_x),
+ scrollbar_get_offset(box->scroll_x),
y_parent + box->y -
- scroll_get_offset(box->scroll_y),
+ scrollbar_get_offset(box->scroll_y),
clip, scale, current_background_color))
return false;
@@ -716,13 +716,13 @@ bool html_redraw_box(struct box *box, int x_parent, int y_parent,
return false;
if (box->scroll_x != NULL)
- scroll_redraw(box->scroll_x,
+ scrollbar_redraw(box->scroll_x,
x_parent + box->x,
y_parent + box->y + box->padding[TOP] +
box->height + box->padding[BOTTOM] -
SCROLLBAR_WIDTH, clip, scale);
if (box->scroll_y != NULL)
- scroll_redraw(box->scroll_y,
+ scrollbar_redraw(box->scroll_y,
x_parent + box->x + box->padding[LEFT] +
box->width + box->padding[RIGHT] -
SCROLLBAR_WIDTH,
@@ -761,18 +761,18 @@ bool html_redraw_box_children(struct box *box, int x_parent, int y_parent,
if (c->type != BOX_FLOAT_LEFT && c->type != BOX_FLOAT_RIGHT)
if (!html_redraw_box(c,
x_parent + box->x -
- scroll_get_offset(box->scroll_x),
+ scrollbar_get_offset(box->scroll_x),
y_parent + box->y -
- scroll_get_offset(box->scroll_y),
+ scrollbar_get_offset(box->scroll_y),
clip, scale, current_background_color))
return false;
}
for (c = box->float_children; c; c = c->next_float)
if (!html_redraw_box(c,
x_parent + box->x -
- scroll_get_offset(box->scroll_x),
+ scrollbar_get_offset(box->scroll_x),
y_parent + box->y -
- scroll_get_offset(box->scroll_y),
+ scrollbar_get_offset(box->scroll_y),
clip, scale, current_background_color))
return false;