From 69cea38f41b411ca9e55db365cf94339f4be891c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 26 Apr 2016 12:14:56 +0100 Subject: update scrollbar_create error handling to return nserror --- render/box.c | 10 ++++++---- render/form.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'render') diff --git a/render/box.c b/render/box.c index 7111f1a6e..5a0735e24 100644 --- a/render/box.c +++ b/render/box.c @@ -1151,11 +1151,12 @@ bool box_handle_scrollbars(struct content *c, struct box *box, } data->c = c; data->box = box; - if (!scrollbar_create(false, visible_height, + if (scrollbar_create(false, visible_height, full_height, visible_height, data, html_overflow_scroll_callback, - &(box->scroll_y))) + &(box->scroll_y)) != NSERROR_OK) { return false; + } } else { scrollbar_set_extents(box->scroll_y, visible_height, visible_height, full_height); @@ -1171,13 +1172,14 @@ bool box_handle_scrollbars(struct content *c, struct box *box, } data->c = c; data->box = box; - if (!scrollbar_create(true, + if (scrollbar_create(true, visible_width - (right ? SCROLLBAR_WIDTH : 0), full_width, visible_width, data, html_overflow_scroll_callback, - &box->scroll_x)) + &box->scroll_x) != NSERROR_OK) { return false; + } } else { scrollbar_set_extents(box->scroll_x, visible_width - diff --git a/render/form.c b/render/form.c index 1adce23d8..f53e9dece 100644 --- a/render/form.c +++ b/render/form.c @@ -1131,13 +1131,13 @@ bool form_open_select_menu(void *client_data, } menu->client_data = client_data; menu->callback = callback; - if (!scrollbar_create(false, + if (scrollbar_create(false, menu->height, total_height, menu->height, control, form_select_menu_scroll_callback, - &(menu->scrollbar))) { + &(menu->scrollbar)) != NSERROR_OK) { free(menu); return false; } -- cgit v1.2.3