Set content handlers now set pointer via content msg.

This commit is contained in:
Michael Drake 2012-08-17 10:02:10 +01:00
parent 142a0bf859
commit 8e315f9f8f
2 changed files with 12 additions and 6 deletions

View File

@ -829,8 +829,10 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
}
if (!iframe)
browser_window_set_pointer(bw, pointer);
if (!iframe) {
msg_data.pointer = pointer;
content_broadcast(c, CONTENT_MSG_POINTER, msg_data);
}
/* deferred actions that can cause this browser_window to be destroyed
* and must therefore be done after set_status/pointer
@ -861,6 +863,7 @@ 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;
union content_msg_data msg_data;
switch(scrollbar_data->msg) {
case SCROLLBAR_MSG_MOVED:
@ -885,9 +888,10 @@ void html_overflow_scroll_callback(void *client_data,
browser_window_set_drag_type(html->bw,
DRAGGING_NONE, NULL);
browser_window_set_pointer(html->bw,
BROWSER_POINTER_DEFAULT);
msg_data.pointer = BROWSER_POINTER_AUTO;
content_broadcast(data->c, CONTENT_MSG_POINTER,
msg_data);
break;
}
}

View File

@ -676,6 +676,7 @@ void textplain_mouse_action(struct content *c, struct browser_window *bw,
{
textplain_content *text = (textplain_content *) c;
browser_pointer_shape pointer = BROWSER_POINTER_DEFAULT;
union content_msg_data msg_data;
const char *status = 0;
size_t idx;
int dir = 0;
@ -708,7 +709,8 @@ void textplain_mouse_action(struct content *c, struct browser_window *bw,
if (status != NULL)
browser_window_set_status(bw, status);
browser_window_set_pointer(bw, pointer);
msg_data.pointer = pointer;
content_broadcast(c, CONTENT_MSG_POINTER, msg_data);
}