enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix hotspot in e17 - cedrics deferred edje stuff b0rked it! :( 

SVN revision: 35959
This commit is contained in:
Carsten Haitzler 2008-09-11 23:31:11 +00:00
parent ef8675ec08
commit ebc2951140
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_pointer.c
View File

@ -307,7 +307,9 @@ _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
p = data; p = data;
if (!p->e_cursor) return; if (!p->e_cursor) return;
evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL); edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
&x, &y, NULL, NULL);
printf("@@@@@@@@@@@@@@@@@@@@@@ HOT CHANGE -> %i %i\n", x, y);
if ((p->hot.x != x) || (p->hot.y != y)) if ((p->hot.x != x) || (p->hot.y != y))
{ {
p->hot.x = x; p->hot.x = x;
@ -360,7 +362,8 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
{ {
Evas_Object *o; Evas_Object *o;
char cursor[1024]; char cursor[1024];
Evas_Coord x, y;
if (!p->evas) _e_pointer_canvas_add(p); if (!p->evas) _e_pointer_canvas_add(p);
o = p->pointer_object; o = p->pointer_object;
if (p->color) if (p->color)
@ -376,6 +379,14 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
goto fallback; goto fallback;
} }
edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object); edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object);
edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot",
&x, &y, NULL, NULL);
printf("@@@@@@@@@@@@@@@@@@@@@@ HOT @ -> %i %i\n", x, y);
if ((p->hot.x != x) || (p->hot.y != y))
{
p->hot.x = x;
p->hot.y = y;
}
p->hot.update = 1; p->hot.update = 1;
return 1; return 1;
} }

2
src/bin/e_scrollframe.c
View File

@ -675,6 +675,8 @@ _e_smart_scrollbar_read(E_Smart_Data *sd)
x = vx * (double)mx; x = vx * (double)mx;
y = vy * (double)my; y = vy * (double)my;
sd->pan_func.set(sd->pan_obj, x, y); sd->pan_func.set(sd->pan_obj, x, y);
if ((e_config->thumbscroll_enable) && (sd->down.now) && (!sd->down.dragged))
sd->down.now = 0;
} }
static void static void