Frond ends signal end of drag with call to browser_window_mouse_track.

svn path=/trunk/netsurf/; revision=12515
This commit is contained in:
Michael Drake 2011-06-27 17:45:17 +00:00
parent 23eea5de9f
commit 2bedf4d88f
8 changed files with 15 additions and 13 deletions

View File

@ -1251,7 +1251,7 @@ void ami_handle_msg(void)
} }
else else
{ {
browser_window_mouse_drag_end(gwin->bw, 0, x, y); browser_window_mouse_track(gwin->bw, 0, x, y);
} }
gwin->mouse_state=0; gwin->mouse_state=0;
break; break;
@ -1287,7 +1287,7 @@ void ami_handle_msg(void)
} }
else else
{ {
browser_window_mouse_drag_end(gwin->bw, 0, x, y); browser_window_mouse_track(gwin->bw, 0, x, y);
} }
gwin->mouse_state=0; gwin->mouse_state=0;
break; break;

View File

@ -158,7 +158,8 @@ static void window_track_mouse_state( LGRECT * bwrect, bool within, short mx, sh
LOG(("Drag for %d ended", i)); LOG(("Drag for %d ended", i));
bmstate &= ~( BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_1 ) ; bmstate &= ~( BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_1 ) ;
if( within ) { if( within ) {
browser_window_mouse_drag_end( /* drag end */
browser_window_mouse_track(
gw->browser->bw, 0, nx, ny gw->browser->bw, 0, nx, ny
); );
} }
@ -167,7 +168,8 @@ static void window_track_mouse_state( LGRECT * bwrect, bool within, short mx, sh
bmstate &= ~( BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_2 ) ; bmstate &= ~( BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_2 ) ;
LOG(("Drag for %d ended", i)); LOG(("Drag for %d ended", i));
if( within ) { if( within ) {
browser_window_mouse_drag_end( /* drag end */
browser_window_mouse_track(
gw->browser->bw, 0, nx, ny gw->browser->bw, 0, nx, ny
); );
} }

View File

@ -867,7 +867,7 @@ void nsbeos_dispatch_event(BMessage *message)
where.x / gui->bw->scale, where.x / gui->bw->scale,
where.y / gui->bw->scale); where.y / gui->bw->scale);
else else
browser_window_mouse_drag_end(gui->bw, (browser_mouse_state)0, browser_window_mouse_track(gui->bw, (browser_mouse_state)0,
where.x, where.y); where.x, where.y);
gui->mouse.state = 0; gui->mouse.state = 0;

View File

@ -241,7 +241,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
if (isDragging) { if (isDragging) {
isDragging = NO; isDragging = NO;
browser_window_mouse_drag_end( browser, modifierFlags, location.x, location.y ); browser_window_mouse_track( browser, (browser_mouse_state)0, location.x, location.y );
} else { } else {
modifierFlags |= BROWSER_MOUSE_CLICK_1; modifierFlags |= BROWSER_MOUSE_CLICK_1;
if ([theEvent clickCount] == 2) modifierFlags |= BROWSER_MOUSE_DOUBLE_CLICK; if ([theEvent clickCount] == 2) modifierFlags |= BROWSER_MOUSE_DOUBLE_CLICK;

View File

@ -323,7 +323,7 @@ static gboolean nsgtk_window_button_release_event(GtkWidget *widget,
event->x / g->bw->scale, event->x / g->bw->scale,
event->y / g->bw->scale); event->y / g->bw->scale);
} else { } else {
browser_window_mouse_drag_end(g->bw, 0, event->x / g->bw->scale, browser_window_mouse_track(g->bw, 0, event->x / g->bw->scale,
event->y / g->bw->scale); event->y / g->bw->scale);
} }

View File

@ -183,7 +183,7 @@ void ro_gui_selection_drag_end(struct gui_window *g, wimp_dragged *drag)
} }
if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos)) if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos))
browser_window_mouse_drag_end(g->bw, 0, pos.x, pos.y); browser_window_mouse_track(g->bw, 0, pos.x, pos.y);
} }

View File

@ -3636,7 +3636,7 @@ void ro_gui_window_scroll_end(struct gui_window *g, wimp_dragged *drag)
} }
if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos)) if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos))
browser_window_mouse_drag_end(g->bw, 0, pos.x, pos.y); browser_window_mouse_track(g->bw, 0, pos.x, pos.y);
} }

View File

@ -371,10 +371,10 @@ nsws_drawable_mouseup(struct gui_window *gw,
(x + gw->scrollx) / gw->bw->scale, (x + gw->scrollx) / gw->bw->scale,
(y + gw->scrolly) / gw->bw->scale); (y + gw->scrolly) / gw->bw->scale);
} else { } else {
browser_window_mouse_drag_end(gw->bw, browser_window_mouse_track(gw->bw,
0, 0,
(x + gw->scrollx) / gw->bw->scale, (x + gw->scrollx) / gw->bw->scale,
(y + gw->scrolly) / gw->bw->scale); (y + gw->scrolly) / gw->bw->scale);
} }
gw->mouse->state = 0; gw->mouse->state = 0;