From 9b2339df4819135aa463ccf7d94c1e9166db85c6 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 20 Nov 2004 04:43:37 +0000 Subject: [PATCH] fix initial dragable values SVN revision: 12229 --- legacy/edje/data/src/e_logo.edc | 2 +- legacy/edje/src/lib/edje_load.c | 2 +- legacy/edje/src/lib/edje_util.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/legacy/edje/data/src/e_logo.edc b/legacy/edje/data/src/e_logo.edc index 317f7b4a7c..9f37095c6b 100644 --- a/legacy/edje/data/src/e_logo.edc +++ b/legacy/edje/data/src/e_logo.edc @@ -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"; } diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index 629639af63..1ffdc0e100 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -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)) && diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 88f7caf201..3bdcf6203f 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -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;