forked from enlightenment/efl
parent
e697a6ef5c
commit
5f1aa30a8e
|
@ -253,9 +253,9 @@ _slice_3d(Widget_Data *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y,
|
|||
evas_map_util_3d_perspective(m, x + (w / 2), y + (h / 2), 0, 1024);
|
||||
for (i = 0; i < 4; i++)
|
||||
{
|
||||
Evas_Coord x, y, z;
|
||||
evas_map_point_coord_get(m, i, &x, &y, &z);
|
||||
evas_map_point_coord_set(m, i, x, y, 0);
|
||||
Evas_Coord xx, yy, zz;
|
||||
evas_map_point_coord_get(m, i, &xx, &yy, &zz);
|
||||
evas_map_point_coord_set(m, i, xx, yy, 0);
|
||||
}
|
||||
if (evas_map_util_clockwise_get(m)) evas_object_show(sl->obj);
|
||||
else evas_object_hide(sl->obj);
|
||||
|
@ -292,15 +292,15 @@ _slice_light(Widget_Data *st __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y,
|
|||
|
||||
static void
|
||||
_slice_xyz(Widget_Data *st __UNUSED__, Slice *sl,
|
||||
double x1, double y1, double z1,
|
||||
double x2, double y2, double z2,
|
||||
double x3, double y3, double z3,
|
||||
double x4, double y4, double z4)
|
||||
double xx1, double yy1, double zz1,
|
||||
double xx2, double yy2, double zz2,
|
||||
double xx3, double yy3, double zz3,
|
||||
double xx4, double yy4, double zz4)
|
||||
{
|
||||
sl->x[0] = x1; sl->y[0] = y1; sl->z[0] = z1;
|
||||
sl->x[1] = x2; sl->y[1] = y2; sl->z[1] = z2;
|
||||
sl->x[2] = x3; sl->y[2] = y3; sl->z[2] = z3;
|
||||
sl->x[3] = x4; sl->y[3] = y4; sl->z[3] = z4;
|
||||
sl->x[0] = xx1; sl->y[0] = yy1; sl->z[0] = zz1;
|
||||
sl->x[1] = xx2; sl->y[1] = yy2; sl->z[1] = zz2;
|
||||
sl->x[2] = xx3; sl->y[2] = yy3; sl->z[2] = zz3;
|
||||
sl->x[3] = xx4; sl->y[3] = yy4; sl->z[3] = zz4;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -586,19 +586,19 @@ _clear_if_finished(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_inside(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
|
||||
_inside(Evas_Coord xx1, Evas_Coord yy1, Evas_Coord xx2, Evas_Coord yy2)
|
||||
{
|
||||
int w = _elm_config->finger_size >> 1; /* Finger size devided by 2 */
|
||||
if (x1 < (x2 - w))
|
||||
if (xx1 < (xx2 - w))
|
||||
return EINA_FALSE;
|
||||
|
||||
if (x1 > (x2 + w))
|
||||
if (xx1 > (xx2 + w))
|
||||
return EINA_FALSE;
|
||||
|
||||
if (y1 < (y2 - w))
|
||||
if (yy1 < (yy2 - w))
|
||||
return EINA_FALSE;
|
||||
|
||||
if (y1 > (y2 + w))
|
||||
if (yy1 > (yy2 + w))
|
||||
return EINA_FALSE;
|
||||
|
||||
return EINA_TRUE;
|
||||
|
|
Loading…
Reference in New Issue