From 4872bc30b8e20a8da9e822725066cc6a5f7955e1 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 16 Aug 2012 13:13:25 +0100 Subject: Remove redundant scrollbar widget message. --- render/form.c | 10 +--------- render/html_interaction.c | 24 ------------------------ 2 files changed, 1 insertion(+), 33 deletions(-) (limited to 'render') diff --git a/render/form.c b/render/form.c index c828d817c..c1f097f79 100644 --- a/render/form.c +++ b/render/form.c @@ -1272,18 +1272,10 @@ void form_select_menu_scroll_callback(void *client_data, html_content *html = (html_content *)menu->c; switch (scrollbar_data->msg) { - case SCROLLBAR_MSG_REDRAW: - menu->callback(menu->client_data, - menu->width - - SCROLLBAR_WIDTH + scrollbar_data->x0, - scrollbar_data->y0, - scrollbar_data->x1 - scrollbar_data->x0, - scrollbar_data->y1 - scrollbar_data->y0); - break; case SCROLLBAR_MSG_MOVED: menu->callback(menu->client_data, 0, 0, - menu->width - SCROLLBAR_WIDTH, + menu->width, menu->height); break; case SCROLLBAR_MSG_SCROLL_START: diff --git a/render/html_interaction.c b/render/html_interaction.c index 6b5cef29a..3836ac062 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -833,32 +833,8 @@ void html_overflow_scroll_callback(void *client_data, struct html_scrollbar_data *data = client_data; html_content *html = (html_content *)data->c; struct box *box = data->box; - int x, y, box_x, box_y, diff_x, diff_y; switch(scrollbar_data->msg) { - case SCROLLBAR_MSG_REDRAW: - diff_x = box->padding[LEFT] + box->width + - box->padding[RIGHT] - SCROLLBAR_WIDTH; - diff_y = box->padding[TOP] + box->height + - box->padding[BOTTOM] - SCROLLBAR_WIDTH; - - box_coords(box, &box_x, &box_y); - if (scrollbar_is_horizontal( - scrollbar_data->scrollbar)) { - x = box_x + scrollbar_get_offset(box->scroll_x); - y = box_y + scrollbar_get_offset(box->scroll_y) + - diff_y; - } else { - x = box_x + scrollbar_get_offset(box->scroll_x) + - diff_x; - y = box_y + scrollbar_get_offset(box->scroll_y); - } - content__request_redraw((struct content *)html, - x + scrollbar_data->x0, - y + scrollbar_data->y0, - scrollbar_data->x1 - scrollbar_data->x0, - scrollbar_data->y1 - scrollbar_data->y0); - break; case SCROLLBAR_MSG_MOVED: html_redraw_a_box(html->bw->current_content, box); break; -- cgit v1.2.3