diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 18:22:22 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-08-24 18:22:22 +0000 |
commit | a47dff15ddb9606c6c07b0c68cb83d6dbc254a92 (patch) | |
tree | 83c7c95844ac761ecf38adb868fedcad30b99bc9 /desktop/browser.c | |
parent | 24110be3108c802dd02c36f334cea9fa519f4f9c (diff) | |
download | netsurf-a47dff15ddb9606c6c07b0c68cb83d6dbc254a92.tar.gz netsurf-a47dff15ddb9606c6c07b0c68cb83d6dbc254a92.tar.bz2 |
Improve browser window drag tracking, so that drags in internal browser windows (iframes) carry on if pointer goes outside the bw that owns the drag.
svn path=/trunk/netsurf/; revision=12663
Diffstat (limited to 'desktop/browser.c')
-rw-r--r-- | desktop/browser.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 17df4b585..6548d2e20 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -324,6 +324,13 @@ void browser_window_set_position(struct browser_window *bw, int x, int y) void browser_window_set_drag_type(struct browser_window *bw, browser_drag_type type) { + struct browser_window *top_bw = browser_window_get_root(bw); + + if (type == DRAGGING_NONE) + top_bw->drag_window = NULL; + else + top_bw->drag_window = bw; + bw->drag_type = type; } @@ -1857,6 +1864,24 @@ void browser_window_mouse_track(struct browser_window *bw, const char *status = NULL; gui_pointer_shape pointer = GUI_POINTER_DEFAULT; + if (bw->window != NULL) { + /* root browser window */ + if (bw->drag_window) { + /* There's an active drag in a sub window. + * Pass the mouse action straight on to that bw. */ + int off_x = 0; + int off_y = 0; + + browser_window_get_position(bw->drag_window, true, + &off_x, &off_y); + + browser_window_mouse_track(bw->drag_window, mouse, + x - off_x / bw->scale, + y - off_y / bw->scale); + return; + } + } + if (c == NULL && bw->drag_type != DRAGGING_FRAME) return; |