enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

fix initial dragable values 

SVN revision: 12229
This commit is contained in:
Carsten Haitzler 2004-11-20 04:43:37 +00:00
parent e6266fde4f
commit 9b2339df48
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edje/data/src/e_logo.edc
View File

@ -462,7 +462,7 @@ collections {
mouse_events: 1; mouse_events: 1;
dragable { dragable {
// drag in: DIR: ON/OFF STEPPING COUNT; // drag in: DIR: ON/OFF STEPPING COUNT;
x: -1 1 0; x: 1 1 0;
y: 1 1 0; y: 1 1 0;
confine: "background"; confine: "background";
} }

2
legacy/edje/src/lib/edje_load.c
View File

@ -262,7 +262,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
if (_edje_block_break(ed)) break; if (_edje_block_break(ed)) break;
if (rp->part->dragable.x < 0) rp->drag.val.x = 1.0; if (rp->part->dragable.x < 0) rp->drag.val.x = 1.0;
if (rp->part->dragable.y < 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; ed->dirty = 1;
if ((evas_object_clipees_get(ed->clipper)) && if ((evas_object_clipees_get(ed->clipper)) &&

14
legacy/edje/src/lib/edje_util.c
View File

@ -945,13 +945,13 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
return; return;
} }
if (rp->drag.down.count > 0) return; if (rp->drag.down.count > 0) return;
if(rp->part->dragable.confine_id != -1) if (rp->part->dragable.confine_id != -1)
{ {
if (dx < 0.0) dx = 0.0; if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0; else if (dx > 1.0) dx = 1.0;
if (dy < 0.0) dy = 0.0; if (dy < 0.0) dy = 0.0;
else if (dy > 1.0) dy = 1.0; else if (dy > 1.0) dy = 1.0;
} }
if (rp->part->dragable.x < 0) dx = 1.0 - dx; if (rp->part->dragable.x < 0) dx = 1.0 - dx;
if (rp->part->dragable.y < 0) dy = 1.0 - dy; if (rp->part->dragable.y < 0) dy = 1.0 - dy;
if ((rp->drag.val.x == dx) && (rp->drag.val.y == dy)) return; if ((rp->drag.val.x == dx) && (rp->drag.val.y == dy)) return;