Let *_drop_file_at_point determine if a drop is possible.

This commit is contained in:
Michael Drake 2012-08-20 12:12:10 +01:00
parent 7d4af30468
commit a4f796e217
2 changed files with 12 additions and 6 deletions

View File

@ -269,13 +269,14 @@ bool browser_window_scroll_at_point(struct browser_window *bw,
int x, int y, int scrx, int scry);
/**
* Drop a file onto a browser window at a particular point.
* Drop a file onto a browser window at a particular point, or determine if a
* file may be dropped onto the content at given point.
*
* \param bw browser window to look inside
* \param x x-coordinate of point of interest
* \param y y-coordinate of point of interest
* \param file path to file to be dropped
* \return true iff file drop has been handled
* \param file path to file to be dropped, or NULL to know if drop allowed
* \return true iff file drop has been handled, or if drop possible (NULL file)
*/
bool browser_window_drop_file_at_point(struct browser_window *bw,
int x, int y, char *file);

View File

@ -2731,13 +2731,14 @@ html_scroll_at_point(struct content *c, int x, int y, int scrx, int scry)
/**
* Drop a file onto a content at a particular point.
* Drop a file onto a content at a particular point, or determine if a file
* may be dropped onto the content at given point.
*
* \param c html content to look inside
* \param x x-coordinate of point of interest
* \param y y-coordinate of point of interest
* \param file path to file to be dropped
* \return true iff file drop has been handled
* \param file path to file to be dropped, or NULL to know if drop allowed
* \return true iff file drop has been handled, or if drop possible (NULL file)
*/
static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
{
@ -2785,6 +2786,10 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
/* No box capable of handling drop */
return false;
if (file == NULL)
/* There is a box capable of handling drop here */
return true;
/* Handle the drop */
if (file_box) {
/* File dropped on file input */