forked from enlightenment/efl
oops- for repat events this screws up grabbing..
SVN revision: 11612
This commit is contained in:
parent
674c783cdf
commit
fa49841f36
|
@ -175,7 +175,7 @@ evas_event_feed_mouse_down_data(Evas *e, int b, const void *data)
|
||||||
|
|
||||||
obj = l->data;
|
obj = l->data;
|
||||||
obj->mouse_grabbed = 1;
|
obj->mouse_grabbed = 1;
|
||||||
e->pointer.mouse_grabbed = 1;
|
e->pointer.mouse_grabbed++;
|
||||||
|
|
||||||
ev.button = b;
|
ev.button = b;
|
||||||
ev.output.x = e->pointer.x;
|
ev.output.x = e->pointer.x;
|
||||||
|
@ -260,6 +260,7 @@ evas_event_feed_mouse_up_data(Evas *e, int b, const void *data)
|
||||||
|
|
||||||
obj = l->data;
|
obj = l->data;
|
||||||
if (!e->pointer.button) obj->mouse_grabbed = 0;
|
if (!e->pointer.button) obj->mouse_grabbed = 0;
|
||||||
|
e->pointer.mouse_grabbed--;
|
||||||
ev.button = b;
|
ev.button = b;
|
||||||
ev.output.x = e->pointer.x;
|
ev.output.x = e->pointer.x;
|
||||||
ev.output.y = e->pointer.y;
|
ev.output.y = e->pointer.y;
|
||||||
|
@ -277,7 +278,6 @@ evas_event_feed_mouse_up_data(Evas *e, int b, const void *data)
|
||||||
Evas_List *ins;
|
Evas_List *ins;
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
|
|
||||||
e->pointer.mouse_grabbed = 0;
|
|
||||||
/* get new list of ins */
|
/* get new list of ins */
|
||||||
ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
|
ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
|
||||||
/* go thru old list of in objects */
|
/* go thru old list of in objects */
|
||||||
|
@ -365,7 +365,7 @@ evas_event_feed_mouse_move_data(Evas *e, int x, int y, const void *data)
|
||||||
e->pointer.canvas_x = evas_coord_screen_x_to_world(e, x);
|
e->pointer.canvas_x = evas_coord_screen_x_to_world(e, x);
|
||||||
e->pointer.canvas_y = evas_coord_screen_y_to_world(e, y);
|
e->pointer.canvas_y = evas_coord_screen_y_to_world(e, y);
|
||||||
/* if our mouse button is grabbed to any objects */
|
/* if our mouse button is grabbed to any objects */
|
||||||
if (e->pointer.mouse_grabbed)
|
if (e->pointer.mouse_grabbed != 0)
|
||||||
{
|
{
|
||||||
/* go thru old list of in objects */
|
/* go thru old list of in objects */
|
||||||
Evas_List *outs = NULL;
|
Evas_List *outs = NULL;
|
||||||
|
|
|
@ -276,7 +276,7 @@ struct _Evas
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
char inside : 1;
|
char inside : 1;
|
||||||
char mouse_grabbed : 1;
|
int mouse_grabbed;
|
||||||
DATA32 button;
|
DATA32 button;
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue