diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 15:38:06 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 15:38:06 +0100 |
| commit | 83c8e940f80368771eb499f8fbea6abafe04cd67 (patch) | |
| tree | 6788682a028277f7ef513e8dbf63f5eb19e75db2 | |
| parent | 02d5589dfab86f13b1fc93ae32c52540d0c97f80 (diff) | |
| download | netsurf-83c8e940f80368771eb499f8fbea6abafe04cd67.tar.gz netsurf-83c8e940f80368771eb499f8fbea6abafe04cd67.tar.bz2 | |
Don't pass status to frames handler.
| -rw-r--r-- | desktop/frames.c | 7 | ||||
| -rw-r--r-- | desktop/frames.h | 2 | ||||
| -rw-r--r-- | render/html_interaction.c | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/desktop/frames.c b/desktop/frames.c index 72f1ba561..da9a7dcf2 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -796,7 +796,7 @@ bool browser_window_resolve_frame_dimension(struct browser_window *bw, bool browser_window_resize_frames(struct browser_window *bw, browser_mouse_state mouse, int x, int y, - gui_pointer_shape *pointer, const char **status, + gui_pointer_shape *pointer, bool *action) { struct browser_window *parent; bool left, right, up, down; @@ -897,7 +897,6 @@ bool browser_window_resize_frames(struct browser_window *bw, bw->drag_resize_up = up; bw->drag_resize_down = down; - *status = messages_get("FrameDrag"); *action = true; } return true; @@ -907,13 +906,13 @@ bool browser_window_resize_frames(struct browser_window *bw, if (bw->children) { for (i = 0; i < (bw->cols * bw->rows); i++) if (browser_window_resize_frames(&bw->children[i], - mouse, x, y, pointer, status, action)) + mouse, x, y, pointer, action)) return true; } if (bw->iframes) { for (i = 0; i < bw->iframe_count; i++) if (browser_window_resize_frames(&bw->iframes[i], - mouse, x, y, pointer, status, action)) + mouse, x, y, pointer, action)) return true; } return false; diff --git a/desktop/frames.h b/desktop/frames.h index 11fbcea2f..68a182c4d 100644 --- a/desktop/frames.h +++ b/desktop/frames.h @@ -35,7 +35,7 @@ void browser_window_create_frameset(struct browser_window *bw, void browser_window_recalculate_frameset(struct browser_window *bw); bool browser_window_resize_frames(struct browser_window *bw, browser_mouse_state mouse, int x, int y, - gui_pointer_shape *pointer, const char **status, bool *action); + gui_pointer_shape *pointer, bool *action); void browser_window_resize_frame(struct browser_window *bw, int x, int y); void browser_window_scroll_callback(void *client_data, diff --git a/render/html_interaction.c b/render/html_interaction.c index 8b562378f..be43ceb07 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -585,9 +585,11 @@ void html_mouse_action(struct content *c, struct browser_window *bw, struct browser_window *parent; for (parent = bw->parent; parent->parent; parent = parent->parent); - done = browser_window_resize_frames(parent, mouse, + if (browser_window_resize_frames(parent, mouse, x + bw->x, y + bw->y, - &pointer, &status, &done); + &pointer, &done)) { + status = messages_get("FrameDrag"); + } } /* if clicking in the main page, remove the selection from any |