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

Don't pass status to frames handler.

This commit is contained in:
Michael Drake 2012-08-16 15:38:06 +01:00
parent 02d5589dfa
commit 83c8e940f8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/frames.c
View File

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

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

6
render/html_interaction.c
View File

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