parent
e6266fde4f
commit
9b2339df48
|
@ -462,7 +462,7 @@ collections {
|
|||
mouse_events: 1;
|
||||
dragable {
|
||||
// drag in: DIR: ON/OFF STEPPING COUNT;
|
||||
x: -1 1 0;
|
||||
x: 1 1 0;
|
||||
y: 1 1 0;
|
||||
confine: "background";
|
||||
}
|
||||
|
|
|
@ -262,7 +262,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
|
|||
if (_edje_block_break(ed)) break;
|
||||
if (rp->part->dragable.x < 0) rp->drag.val.x = 1.0;
|
||||
if (rp->part->dragable.y < 0) rp->drag.val.x = 1.0;
|
||||
_edje_dragable_pos_set(ed, rp, 1.0, 1.0);
|
||||
_edje_dragable_pos_set(ed, rp, rp->drag.val.x, rp->drag.val.y);
|
||||
}
|
||||
ed->dirty = 1;
|
||||
if ((evas_object_clipees_get(ed->clipper)) &&
|
||||
|
|
|
@ -945,13 +945,13 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
|
|||
return;
|
||||
}
|
||||
if (rp->drag.down.count > 0) return;
|
||||
if(rp->part->dragable.confine_id != -1)
|
||||
{
|
||||
if (dx < 0.0) dx = 0.0;
|
||||
else if (dx > 1.0) dx = 1.0;
|
||||
if (dy < 0.0) dy = 0.0;
|
||||
else if (dy > 1.0) dy = 1.0;
|
||||
}
|
||||
if (rp->part->dragable.confine_id != -1)
|
||||
{
|
||||
if (dx < 0.0) dx = 0.0;
|
||||
else if (dx > 1.0) dx = 1.0;
|
||||
if (dy < 0.0) dy = 0.0;
|
||||
else if (dy > 1.0) dy = 1.0;
|
||||
}
|
||||
if (rp->part->dragable.x < 0) dx = 1.0 - dx;
|
||||
if (rp->part->dragable.y < 0) dy = 1.0 - dy;
|
||||
if ((rp->drag.val.x == dx) && (rp->drag.val.y == dy)) return;
|
||||
|
|
Loading…
Reference in New Issue