summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-10-25 12:04:11 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2014-10-25 12:04:11 +0100
commiteed2a97eca65f1b65faf85865d67171031653727 (patch)
tree8046128b9b02b9dbb7750d86239a26c8c0d46b19 /render
parentaf3cb6bf94b77cda7435cc26f55aca8b193bd89d (diff)
downloadnetsurf-eed2a97eca65f1b65faf85865d67171031653727.tar.gz
netsurf-eed2a97eca65f1b65faf85865d67171031653727.tar.bz2
Add bw function to get scrollbar type.
Diffstat (limited to 'render')
-rw-r--r--render/box_construct.c14
-rw-r--r--render/html.h5
2 files changed, 10 insertions, 9 deletions
diff --git a/render/box_construct.c b/render/box_construct.c
index 025220802..c73d0590c 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -2015,7 +2015,7 @@ bool box_create_frameset(struct content_html_frames *f, dom_node *n,
/* update frameset and create default children */
f->cols = cols;
f->rows = rows;
- f->scrolling = SCROLLING_NO;
+ f->scrolling = BW_SCROLLING_NO;
f->children = talloc_array(content->bctx, struct content_html_frames,
(rows * cols));
@@ -2034,7 +2034,7 @@ bool box_create_frameset(struct content_html_frames *f, dom_node *n,
frame->name = NULL;
frame->url = NULL;
frame->no_resize = false;
- frame->scrolling = SCROLLING_AUTO;
+ frame->scrolling = BW_SCROLLING_AUTO;
frame->border = default_border;
frame->border_colour = default_border_colour;
frame->children = NULL;
@@ -2170,10 +2170,10 @@ bool box_create_frameset(struct content_html_frames *f, dom_node *n,
if (err == DOM_NO_ERR && s != NULL) {
if (dom_string_caseless_lwc_isequal(s,
corestring_lwc_yes))
- frame->scrolling = SCROLLING_YES;
+ frame->scrolling = BW_SCROLLING_YES;
else if (dom_string_caseless_lwc_isequal(s,
corestring_lwc_no))
- frame->scrolling = SCROLLING_NO;
+ frame->scrolling = BW_SCROLLING_NO;
dom_string_unref(s);
}
@@ -2293,7 +2293,7 @@ bool box_iframe(BOX_SPECIAL_PARAMS)
iframe->margin_height = 0;
iframe->name = NULL;
iframe->url = url;
- iframe->scrolling = SCROLLING_AUTO;
+ iframe->scrolling = BW_SCROLLING_AUTO;
iframe->border = true;
/* Add this iframe to the linked list of iframes */
@@ -2328,10 +2328,10 @@ bool box_iframe(BOX_SPECIAL_PARAMS)
if (err == DOM_NO_ERR && s != NULL) {
if (dom_string_caseless_lwc_isequal(s,
corestring_lwc_yes))
- iframe->scrolling = SCROLLING_YES;
+ iframe->scrolling = BW_SCROLLING_YES;
else if (dom_string_caseless_lwc_isequal(s,
corestring_lwc_no))
- iframe->scrolling = SCROLLING_NO;
+ iframe->scrolling = BW_SCROLLING_NO;
dom_string_unref(s);
}
diff --git a/render/html.h b/render/html.h
index a5ee5ffa5..6f222dbf6 100644
--- a/render/html.h
+++ b/render/html.h
@@ -32,6 +32,7 @@
#include "content/content_type.h"
#include "css/css.h"
+#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "desktop/plot_style.h"
#include "desktop/frame_types.h"
@@ -117,7 +118,7 @@ struct content_html_frames {
struct nsurl *url; /** frame url */
bool no_resize; /** frame is not resizable */
- frame_scrolling scrolling; /** scrolling characteristics */
+ browser_scrolling scrolling; /** scrolling characteristics */
bool border; /** frame has a border */
colour border_colour; /** frame border colour */
@@ -134,7 +135,7 @@ struct content_html_iframe {
char *name; /** frame name (for targetting) */
struct nsurl *url; /** frame url */
- frame_scrolling scrolling; /** scrolling characteristics */
+ browser_scrolling scrolling; /** scrolling characteristics */
bool border; /** frame has a border */
colour border_colour; /** frame border colour */