diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 15:43:14 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-08-16 15:43:14 +0100 |
| commit | 7277ce5dfc981394047bb865ceaf3a37fc33ccd6 (patch) | |
| tree | 08229d1bf6ba81c4b7cd4934d92d2681127ea1b5 | |
| parent | 83c8e940f80368771eb499f8fbea6abafe04cd67 (diff) | |
| download | netsurf-7277ce5dfc981394047bb865ceaf3a37fc33ccd6.tar.gz netsurf-7277ce5dfc981394047bb865ceaf3a37fc33ccd6.tar.bz2 | |
Remove redundant "action" param.
| -rw-r--r-- | desktop/frames.c | 9 | ||||
| -rw-r--r-- | desktop/frames.h | 2 | ||||
| -rw-r--r-- | render/html_interaction.c | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/desktop/frames.c b/desktop/frames.c index da9a7dcf2..4d3844087 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -796,8 +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, - bool *action) { + gui_pointer_shape *pointer) { struct browser_window *parent; bool left, right, up, down; int i, resize_margin; @@ -896,8 +895,6 @@ bool browser_window_resize_frames(struct browser_window *bw, bw->drag_resize_right = right; bw->drag_resize_up = up; bw->drag_resize_down = down; - - *action = true; } return true; } @@ -906,13 +903,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, action)) + mouse, x, y, pointer)) 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, action)) + mouse, x, y, pointer)) return true; } return false; diff --git a/desktop/frames.h b/desktop/frames.h index 68a182c4d..517579110 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, bool *action); + gui_pointer_shape *pointer); 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 be43ceb07..0575ad1fe 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -587,8 +587,12 @@ void html_mouse_action(struct content *c, struct browser_window *bw, parent = parent->parent); if (browser_window_resize_frames(parent, mouse, x + bw->x, y + bw->y, - &pointer, &done)) { - status = messages_get("FrameDrag"); + &pointer)) { + if (mouse & (BROWSER_MOUSE_DRAG_1 | + BROWSER_MOUSE_DRAG_2)) { + status = messages_get("FrameDrag"); + } + done = true; } } |