eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant "action" param.

This commit is contained in:
Michael Drake 2012-08-16 15:43:14 +01:00
parent 83c8e940f8
commit 7277ce5dfc
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/frames.c
View File

@ -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;

2
desktop/frames.h
View File

@ -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,

8
render/html_interaction.c
View File

@ -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;
}
}